]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit528e8c47fb25c8da8b075837028055c2ee648a9d
tree665bebcd325c68a1424a49baf9be52512b2d8aa1
parent0063a476295721b56d6cf85cb68ce937c6f0e2c4
parentc78e13387f7eeaa69d046c436f91e2cbb97f8d37
Merge branch 'arch-timers' into for-linus

Conflicts:
arch/arm/include/asm/timex.h
arch/arm/lib/delay.c