From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2014 00:55:15 +0000 (+1000)
Subject: Merge remote-tracking branch 'pci/next'
X-Git-Tag: next-20140530~87
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b8678db9c5a75239d55d2b682afc60f158cdfd5a;p=karo-tx-linux.git

Merge remote-tracking branch 'pci/next'

Conflicts:
	arch/s390/pci/pci_sysfs.c
---

b8678db9c5a75239d55d2b682afc60f158cdfd5a