]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers/core'
authorIngo Molnar <mingo@kernel.org>
Tue, 14 Jan 2014 16:19:16 +0000 (17:19 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 14 Jan 2014 16:19:16 +0000 (17:19 +0100)
1  2 
kernel/softirq.c
kernel/time/tick-sched.c

Simple merge
Simple merge