Merge remote-tracking branch 'pci/next'

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

Mon, 12 Sep 2016 23:14:57 +0000 (09:14 +1000)

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

Mon, 12 Sep 2016 23:14:57 +0000 (09:14 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2016 23:14:57 +0000 (09:14 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2016 23:14:57 +0000 (09:14 +1000)
diff --cc drivers/pci/quirks.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Sep 2016 23:14:57 +0000 (09:14 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Sep 2016 23:14:57 +0000 (09:14 +1000)
		1	2
drivers/pci/quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history