| commit | 33b9f582c5c1db515412cc7efff28f7d1779321f | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu May 02 21:31:29 2013 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu May 02 21:31:29 2013 +0100 |
| tree | 60ea1b403b41f651bc570f4c368ba82064880796 | |
| parent | 946342d03ec4e8367bba7bb99e7155e97f69058a [diff] | |
| parent | 008ca431822f39a023322b3598d8366faf46cfc1 [diff] |
Merge branch 'cleanup' into for-linus Conflicts: arch/arm/plat-omap/dmtimer.c