projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 485802a a0dee2e)
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)
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

diff --cc drivers/pci/pci.c
Simple merge
diff --cc drivers/pci/quirks.c
Simple merge
diff --cc include/linux/pci.h
Simple merge
Domain: System / Kernel;