projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 751e1f5 c560bbc)
Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 19 May 2011 07:00:06 +0000 (17:00 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 19 May 2011 07:00:06 +0000 (17:00 +1000)
1  2 
arch/powerpc/kernel/smp.c patch | diff1 | diff2 | blob | history
arch/powerpc/sysdev/fsl_msi.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/kernel/smp.c
Simple merge
diff --cc arch/powerpc/sysdev/fsl_msi.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git