]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba4a63f 56942fe)
Merge branch 'arch-timers' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:02:26 +0000 (23:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:02:26 +0000 (23:02 +0100)
Conflicts:
arch/arm/include/asm/timex.h
arch/arm/lib/delay.c


Trivial merge
Linux kernel for KaRo TX COM modules