Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of git://github.com/MISL-EBU-System...
authorJason Cooper <jason@lakedaemon.net>
Wed, 21 Nov 2012 19:57:23 +0000 (19:57 +0000)
committerJason Cooper <jason@lakedaemon.net>
Wed, 21 Nov 2012 19:57:23 +0000 (19:57 +0000)
Marvell XOR driver DT changes for 3.8

Conflicts:
arch/arm/boot/dts/armada-xp.dtsi


Trivial merge