diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:52:14 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:52:14 +0100 |
commit | 65af7c4608f7b7019e2faa220fb9624988965873 (patch) | |
tree | 42be40284249ba4c2584023e94cd12c4df4cffdd /arch/um | |
parent | b1e3be0647fec81887e55edbda0c56c0445f7b53 (diff) | |
parent | 4c23c8da96de1af7ed88ee5258af613e8c03c3ad (diff) |
Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions