]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers/core'
authorIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 15:28:22 +0000 (17:28 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 21 Aug 2012 15:28:22 +0000 (17:28 +0200)
1  2 
kernel/timer.c

diff --cc kernel/timer.c
Simple merge