diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:02:26 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:02:26 +0100 |
| commit | ceaa1a13c0e53242555fa45887d82339a3f93c78 (patch) | |
| tree | 665bebcd325c68a1424a49baf9be52512b2d8aa1 /arch/arm/include/asm/syscall.h | |
| parent | Merge branches 'atags', 'cache-l2x0', 'clkdev', 'fixes', 'integrator', 'misc'... (diff) | |
| parent | ARM: 7538/1: delay: add registration mechanism for delay timer sources (diff) | |
| download | linux-ceaa1a13c0e53242555fa45887d82339a3f93c78.tar.gz linux-ceaa1a13c0e53242555fa45887d82339a3f93c78.zip | |
Merge branch 'arch-timers' into for-linus
Conflicts:
arch/arm/include/asm/timex.h
arch/arm/lib/delay.c
Diffstat (limited to 'arch/arm/include/asm/syscall.h')
0 files changed, 0 insertions, 0 deletions