Merge tag 'at91-driversLCD' of git://github.com/at91linux/linux-at91 into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:08:09 +0000 (23:08 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Mar 2013 22:08:09 +0000 (23:08 +0100)
commit1414fbdcb28f7161b9ab6225a68a45f97fece3c1
tree180db81b7435edf0d8286dbb77694852c2a1a3a3
parentb7442b6c8b081f1a7433ad34697ce6f8e77f4904
parentbbd44f6bd9d1aa735b180b29b5719d63a8e87b55
Merge tag 'at91-driversLCD' of git://github.com/at91linux/linux-at91 into next/drivers

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

Some Atmel framebuffer driver enhancements with modification
of configuration data in ARM/AT91 and AVR32/AP7 trees.
A merge of these modifications seems easier through arm-soc
git tree nowadays.

* tag 'at91-driversLCD' of git://github.com/at91linux/linux-at91:
  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
  ARM: at91: fix LCD-wiring mode
  atmel_lcdfb: fix 16-bpp modes on older SOCs

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