Merge branch 'at91/cleanup' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 20:59:20 +0000 (22:59 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 21:02:30 +0000 (23:02 +0200)
commitd5cd8605e2814d268cddee1ff1d95d9010b4e8eb
tree87f67a177b10ec6c9e6c023cabb1c3607efe20b5
parent21c27cabe69bdce92130364efe5d945323b37986
parent138e8f1c4e99cd349e50fd8b18aebbd2716ceb87
Merge branch 'at91/cleanup' into next/dt

Conflicts:
arch/arm/boot/dts/at91sam9rl.dtsi

Needed as a dependency for the at91/dt2 branch

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig
arch/arm/boot/dts/at91-sama5d3_xplained.dts
arch/arm/boot/dts/at91sam9261.dtsi
arch/arm/boot/dts/at91sam9rl.dtsi
arch/arm/boot/dts/at91sam9rlek.dts
arch/arm/boot/dts/sama5d3.dtsi