projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d6ee6f7 99adcd9)
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Mar 2009 06:10:07 +0000 (17:10 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Mar 2009 06:10:07 +0000 (17:10 +1100)
1  2 
arch/powerpc/sysdev/ppc4xx_pci.c patch | diff1 | diff2 | blob | history
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/sysdev/ppc4xx_pci.c
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge