]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 86e43a7 73d68d9)
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)
commit396d81cd0fe12ce5d1f6d159f093f9315d2837bc
tree555d26a1852d79a58b36b5cc0cfb30bf2c7fc5datree | snapshot
parent86e43a7aff23ce828273cbef6b0d2b0abe095ac8commit | diff
parent73d68d91aa1b9e9cb6c1635143799c0fec484c08commit | diff
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>
Linux kernel for KaRo TX COM modules