Merge remote-tracking branch 'vfio/next'

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

Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)

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

Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)
diff --cc drivers/vfio/pci/vfio_pci.c
Simple merge
diff --cc drivers/vfio/pci/vfio_pci_config.c
Simple merge
diff --cc drivers/vfio/pci/vfio_pci_intrs.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 4 Apr 2013 02:50:15 +0000 (13:50 +1100)
		1	2
drivers/vfio/pci/vfio_pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/vfio/pci/vfio_pci_config.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/vfio/pci/vfio_pci_intrs.c	patch \|	diff1 \|	diff2 \|	blob \| history