Merge branch 'timers.2014.02.25a' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorThomas Gleixner <tglx@linutronix.de>
Fri, 28 Feb 2014 10:53:48 +0000 (11:53 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 28 Feb 2014 10:53:48 +0000 (11:53 +0100)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
kernel/timer.c

diff --cc kernel/timer.c
Simple merge