Merge remote-tracking branch 'pci/next'

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

Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)

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

Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/misc/genwqe/card_utils.c
Simple merge
diff --cc drivers/pci/pci.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 May 2014 02:52:02 +0000 (12:52 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/misc/genwqe/card_utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history