projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e320ec 5728377)
Merge branch 'bjorn-pci-root-v4-2.6.35' into release
authorLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:16 +0000 (16:17 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 28 May 2010 20:17:16 +0000 (16:17 -0400)
1  2 
arch/x86/pci/acpi.c patch | diff1 | diff2 | blob | history
drivers/acpi/pci_root.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/pci/acpi.c
Simple merge
diff --cc drivers/acpi/pci_root.c
Simple merge