Merge branch 'spear/dt' into next/dt
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Apr 2012 21:31:00 +0000 (23:31 +0200)
committerOlof Johansson <olof@lixom.net>
Wed, 9 May 2012 09:15:37 +0000 (02:15 -0700)
* spear/dt:
  ARM: SPEAr3xx: Correct keyboard data passed from DT

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
[olof: rebuilt branch due to drop of an early merge]
Signed-off-by: Olof Johansson <olof@lixom.net>

Trivial merge