]> 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)
commit77df74bb565b9192cc7ba56fee55f3eba99a6c24
tree665bebcd325c68a1424a49baf9be52512b2d8aa1
parent787954b16cf257836839dd107b9f0e22727424f7
parentc094f0e06e99ed56292d9d95fee002f25bf29d6e
Merge branch 'arch-timers' into for-linus

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