Merge remote-tracking branch 'pci-bjorn/topic/alex-vfio-prep' into groups

author Joerg Roedel <joerg.roedel@amd.com>

Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)

committer Joerg Roedel <joerg.roedel@amd.com>

Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)
author Joerg Roedel <joerg.roedel@amd.com>
Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)
committer Joerg Roedel <joerg.roedel@amd.com>
Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)
diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/quirks.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
author	Joerg Roedel <joerg.roedel@amd.com>
	Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)
		1	2
drivers/pci/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/quirks.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history