]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/drivers' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:09:40 +0000 (23:09 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:09:40 +0000 (23:09 +0100)
* next/drivers:
  ARM: at91/avr32/atmel_lcdfb: add platform device-id table
  atmel_lcdfb: move lcdcon2 register access to compute_hozval
  ARM: at91/avr32/atmel_lcdfb: add bus-clock entry


Trivial merge