Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer
authorArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:52:14 +0000 (00:52 +0100)
committerArnd Bergmann <arnd@arndb.de>
Sun, 30 Oct 2011 23:52:14 +0000 (00:52 +0100)
commit65af7c4608f7b7019e2faa220fb9624988965873
tree42be40284249ba4c2584023e94cd12c4df4cffdd
parentb1e3be0647fec81887e55edbda0c56c0445f7b53
parent4c23c8da96de1af7ed88ee5258af613e8c03c3ad
Merge branches 'stericsson/timer' and 'omap/dmtimer' into next/timer