]> Pileus Git - ~andy/linux/commit
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)
commit10420921675582903ab256dc3094206ac0280f68
treeb774e849efa85255b2fbc0a24698c75196038e96
parent13906db670a128864714c30c244b866dce119494
parentd220980b701d838560a70de691b53be007e99e78
Merge branch 'merge' into next

Merge recent fixes to lparcfg so subsequent patches can move
the whole file to arch/powerpc/platforms/pseries
arch/powerpc/Kconfig
arch/powerpc/kernel/lparcfg.c