commit 235ecf4c59ebe13e065a40755d999fa9850b8179
author Arnd Bergmann <arnd@arndb.de> Wed Feb 29 21:05:03 2012 +0000
committer Arnd Bergmann <arnd@arndb.de> Wed Feb 29 21:05:03 2012 +0000
tree fc1048fe799b67413bb5716c1f0775f188500822
parent fb0b82b32ce17564bc64cede50bf4a3204eecc60
parent 967809bd7faf71ddc29c8081e0f21db8b201a0f4

Merge branch 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards

* 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  input: serio: ams-delta: toggle keyboard power over GPIO
  omapfb: lcd_ams_delta: drive control lines over GPIO
  MTD: NAND: ams-delta: use GPIO instead of custom I/O
  LED: drop leds-ams-delta driver
  ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
  ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
  ARM: OMAP1: ams-delta: register latch dependent devices later