Merge remote-tracking branch 'scott/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 29 Jan 2014 05:55:25 +0000 (16:55 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 29 Jan 2014 05:55:25 +0000 (16:55 +1100)
<<
This contains a fix for a chroma_defconfig build break that was
introduced by e6500 tablewalk support, and a device tree binding patch
that missed the previous pull request due to some last-minute polishing.
>>

1  2 
arch/powerpc/Kconfig

Simple merge