diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-28 11:17:32 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-28 11:17:32 +1000 |
commit | 10420921675582903ab256dc3094206ac0280f68 (patch) | |
tree | b774e849efa85255b2fbc0a24698c75196038e96 /arch/arm/mach-omap2/prm.h | |
parent | 13906db670a128864714c30c244b866dce119494 (diff) | |
parent | d220980b701d838560a70de691b53be007e99e78 (diff) | |
download | blackbird-op-linux-10420921675582903ab256dc3094206ac0280f68.tar.gz blackbird-op-linux-10420921675582903ab256dc3094206ac0280f68.zip |
Merge branch 'merge' into next
Merge recent fixes to lparcfg so subsequent patches can move
the whole file to arch/powerpc/platforms/pseries
Diffstat (limited to 'arch/arm/mach-omap2/prm.h')
0 files changed, 0 insertions, 0 deletions