Merge remote-tracking branch 'pci-bjorn/topic/alex-vfio-prep' into groups
authorJoerg Roedel <joerg.roedel@amd.com>
Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Mon, 18 Jun 2012 12:23:13 +0000 (14:23 +0200)
commit3ebb9566007083c6fd92674996d2a0be2ea79745
tree329ea191f04f13cd00479b915bfdd0e519218192
parent485802a6c524e62b5924849dd727ddbb1497cc71
parenta0dee2ed0cdc666b5622f1fc74979355a6b36850
Merge remote-tracking branch 'pci-bjorn/topic/alex-vfio-prep' into groups
drivers/pci/pci.c
drivers/pci/quirks.c
include/linux/pci.h