From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 29 Feb 2012 21:05:03 +0000 (+0000)
Subject: Merge branch 'omap1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux... 
X-Git-Tag: v3.12-rc1~3575^2~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=235ecf4c59ebe13e065a40755d999fa9850b8179;p=kernel%2Fkernel-generic.git

Merge branch 'omap1' of git://git./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
---

235ecf4c59ebe13e065a40755d999fa9850b8179