]> git.karo-electronics.de Git - linux-beck.git/commit
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 10:46:29 +0000 (12:46 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 10:46:29 +0000 (12:46 +0200)
commit0f6b9ee4a0f5dc329ff80fae14baa2cf82a8f385
tree3fd62617aa020c3615b3dc9c8ef5930823811684
parentb26cd30ceb8dc9c464faa895f86acd108f251cce
parentf10491fff07dcced77f8ab1b3bc1f8e18715bfb9
Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre <nicolas.ferre@atmel.com>:

One macb DT node move for 9x5 family: 9g15 doesn't
have an Ethernet interface.
Little fixes mainly related to at91sam9x5 DT, IIO ADC bindings,
pinctrl for at91sam9260/g20 DT and the RTC addition.
Addition of the Acme Systems Aria G25 board.

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encoding
  ARM: at91: dts: add adc resolution stuff
  ARM: at91: add Acme Systems Aria G25 board
  ARM: at91/dt: fix macb node declaration
  ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi
  ARM: at91/trivial: fix model name for SAM9G15-EK
  ARM: at91/trivial: typos in compatible property
  ARM: at91/at91sam9x5: add RTC node

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