| commit | ceaa1a13c0e53242555fa45887d82339a3f93c78 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 04 23:02:26 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Oct 04 23:02:26 2012 +0100 |
| tree | 665bebcd325c68a1424a49baf9be52512b2d8aa1 | |
| parent | ba4a63f89c8f8a014450e45fd96a06a5e078e52f [diff] | |
| parent | 56942fec06efa0e17df0f4c3b438332c923b9014 [diff] |
Merge branch 'arch-timers' into for-linus Conflicts: arch/arm/include/asm/timex.h arch/arm/lib/delay.c