projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 168ae6a cd4faf9)
Merge branch 'pci/taku-acpi-pci-host-bridge-v3' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 22:36:10 +0000 (16:36 -0600)
1  2 
drivers/acpi/pci_root.c patch | diff1 | diff2 | blob | history
include/linux/acpi.h patch | diff1 | diff2 | blob | history

diff --cc drivers/acpi/pci_root.c
Simple merge
diff --cc include/linux/acpi.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.