]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit60ab066453b4a21e18452079391d2c32ca24aa7e
tree87f67a177b10ec6c9e6c023cabb1c3607efe20b5
parent3fc32e2e50c7b0868f62172e1593fe4799f93e65
parentdd637b8b8287f62e57f8bedab1757a8cf181a52e
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