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)
commit98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c
treeb659c328bca921aa0653d5e9c88636ba5c4f3847
parentc9dc03ddbf4e71f20b78277d661388c1bc466258
parenta1d53dab4f5b37c800d7a20c56e84a96180a8ea6
Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

Marvell XOR driver DT changes for 3.8

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