]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit21f936c1d8f7178db3092d71d5f24da69318ac86
tree555d26a1852d79a58b36b5cc0cfb30bf2c7fc5da
parente4c9f02fa660305dc4dfbe9b1fa5d5ce7889eba7
parent6f38acbb4aeb3eefa7b1c9c75155590cb5c7a78f
Merge branch 'at91/dt' into next/dt

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>