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)
commit6875dc6521be57f695845d13469109a388029e43
tree860fd550fcbafc6e23f2602738aa3b3f5de60703
parent22251a9b72c46758254caf3250e6d80ea2b088c8
parentfa599c333d3d66846545026b41bcf36d1350fe30
Merge branch 'spear/dt' into next/dt

* 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>