]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13906db d220980)
Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 28 Aug 2013 01:17:32 +0000 (11:17 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 28 Aug 2013 01:17:32 +0000 (11:17 +1000)
Merge recent fixes to lparcfg so subsequent patches can move
the whole file to arch/powerpc/platforms/pseries

1  2 
arch/powerpc/Kconfig patch | diff1 | diff2 | blob | history
arch/powerpc/kernel/lparcfg.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/Kconfig
Simple merge
diff --cc arch/powerpc/kernel/lparcfg.c
Simple merge
Linux kernel for KaRo TX COM modules