commit | 10420921675582903ab256dc3094206ac0280f68 | [log] [tgz] |
---|---|---|
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Wed Aug 28 11:17:32 2013 +1000 |
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Wed Aug 28 11:17:32 2013 +1000 |
tree | b774e849efa85255b2fbc0a24698c75196038e96 | |
parent | 13906db670a128864714c30c244b866dce119494 [diff] | |
parent | d220980b701d838560a70de691b53be007e99e78 [diff] |
Merge branch 'merge' into next Merge recent fixes to lparcfg so subsequent patches can move the whole file to arch/powerpc/platforms/pseries