]> git.openfabrics.org - ~shefty/rdma-dev.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)
commitceaa1a13c0e53242555fa45887d82339a3f93c78
tree665bebcd325c68a1424a49baf9be52512b2d8aa1
parentba4a63f89c8f8a014450e45fd96a06a5e078e52f
parent56942fec06efa0e17df0f4c3b438332c923b9014
Merge branch 'arch-timers' into for-linus

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