| commit | 7266d48fca8ee2a15d15222c41f887e10db54c5a | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Feb 28 18:54:15 2013 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Feb 28 18:54:15 2013 +0100 |
| tree | 775404bcbf8ce146ccaba905e841a3621ae7ce80 | |
| parent | 168268a225d24da3768a88c1029fb3014b0837ca [diff] | |
| parent | 90cf214d6a549bf482e3c5751ee256cc885b96ea [diff] |
Merge branch 'timer/cleanup' into late/mvebu2 Basing the mvebu patches on top of the timer cleanup avoids some nasty merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>