Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 22 Nov 2012 09:50:55 +0000 (10:50 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Thu, 22 Nov 2012 09:50:55 +0000 (10:50 +0100)
commita79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68
treeccc6042af17706823bc1ccacf931310a9e6ec487
parent9bfd143ed247fc7a9e0573dc1fbaf6d124b5cac9
parent8c4340fcfb3e40372101a608ccd906e456ed3fcd
Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/mach-mvebu/armada-370-xp.c