Merge branch 'pci/reset' into next

author Bjorn Helgaas <[email protected]>

Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)

committer Bjorn Helgaas <[email protected]>

Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)
author Bjorn Helgaas <[email protected]>
Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)
committer Bjorn Helgaas <[email protected]>
Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)
diff --cc drivers/pci/pci.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
author	Bjorn Helgaas <[email protected]>
	Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)
committer	Bjorn Helgaas <[email protected]>
	Wed, 15 Jan 2014 17:53:35 +0000 (10:53 -0700)
		1	2
drivers/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history