Merge branch 'linus' into timers/core
authorIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 13:12:44 +0000 (14:12 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 12 Jan 2014 13:12:44 +0000 (14:12 +0100)
Pick up the latest fixes and refresh the branch.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
init/Kconfig
kernel/time/tick-sched.c

diff --cc init/Kconfig
Simple merge
Simple merge