Merge remote-tracking branch 'pci/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Nov 2012 00:36:08 +0000 (11:36 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Nov 2012 00:36:08 +0000 (11:36 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 00:36:08 +0000 (11:36 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Nov 2012 00:36:08 +0000 (11:36 +1100)
diff --cc drivers/pci/pci-driver.c
Simple merge
diff --cc drivers/pci/pci-sysfs.c
Simple merge
diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/pci.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Nov 2012 00:36:08 +0000 (11:36 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Nov 2012 00:36:08 +0000 (11:36 +1100)
		1	2
drivers/pci/pci-driver.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci-sysfs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history