]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fortglx/3.7/time' of git://git.linaro.org/people/jstultz/linux into...
authorThomas Gleixner <tglx@linutronix.de>
Tue, 9 Oct 2012 19:20:05 +0000 (21:20 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 9 Oct 2012 19:20:05 +0000 (21:20 +0200)
1  2 
kernel/timer.c

diff --cc kernel/timer.c
Simple merge