diff options
author | 2012-04-30 23:31:00 +0200 | |
---|---|---|
committer | 2012-05-09 02:15:37 -0700 | |
commit | 6875dc6521be57f695845d13469109a388029e43 (patch) | |
tree | 860fd550fcbafc6e23f2602738aa3b3f5de60703 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'lpc32xx/dt' of git://git.antcom.de/linux-2.6 into next/dt (diff) | |
parent | ARM: SPEAr3xx: Correct keyboard data passed from DT (diff) | |
download | linux-dev-6875dc6521be57f695845d13469109a388029e43.tar.xz linux-dev-6875dc6521be57f695845d13469109a388029e43.zip |
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 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions