Merge branch 'at91/dt' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 18 May 2012 13:04:12 +0000 (15:04 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 18 May 2012 13:04:12 +0000 (15:04 +0200)
This should help the merge with the at91 adc driver that is currently
in the staging tree.

* at91/dt:
  ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files

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

Trivial merge