| commit | 98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c | [log] [tgz] |
|---|---|---|
| author | Jason Cooper <jason@lakedaemon.net> | Wed Nov 21 19:57:23 2012 +0000 |
| committer | Jason Cooper <jason@lakedaemon.net> | Wed Nov 21 19:57:23 2012 +0000 |
| tree | b659c328bca921aa0653d5e9c88636ba5c4f3847 | |
| parent | c9dc03ddbf4e71f20b78277d661388c1bc466258 [diff] | |
| parent | a1d53dab4f5b37c800d7a20c56e84a96180a8ea6 [diff] |
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