projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e0ea8b2 aa021ba)
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 23:59:04 +0000 (10:59 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Nov 2009 23:59:04 +0000 (10:59 +1100)
1  2 
arch/powerpc/kernel/time.c patch | diff1 | diff2 | blob | history
arch/powerpc/platforms/pseries/xics.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kernel/time.c
Simple merge
diff --cc arch/powerpc/platforms/pseries/xics.c
Simple merge