diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-04-30 23:31:00 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-09 02:15:37 -0700 |
| commit | 6875dc6521be57f695845d13469109a388029e43 (patch) | |
| tree | 860fd550fcbafc6e23f2602738aa3b3f5de60703 /fs/direct-io.c | |
| parent | 22251a9b72c46758254caf3250e6d80ea2b088c8 (diff) | |
| parent | fa599c333d3d66846545026b41bcf36d1350fe30 (diff) | |
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>
Diffstat (limited to 'fs/direct-io.c')
0 files changed, 0 insertions, 0 deletions