]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:14:44 +0000 (23:14 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:14:44 +0000 (23:14 +0100)
From Nicolas Ferre <nicolas.ferre@atmel.com>:

Simplification of Kconfig and splitting of the non-DT part.
Common pattern for DT board file naming.

* tag 'at91-soc' of git://github.com/at91linux/linux-at91:
  ARM: at91: renamme rm9200 dt file
  ARM: at91: rename board-dt to more specific name board-dt-sam9
  ARM: at91: move non DT Kconfig to Kconfig.non_dt

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge