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)
commitdba861461f88c12249ac78fb877866c04f99deb3
tree5812b143581bcc66c7c542f01ba0cb22e489b8e5
parent0e6601eee039893a3f6420596ae4588d90d13cbe
parent228fdc083b017eaf90e578fa86fb1ecfd5ffae87
Merge branch 'linus' into timers/core

Pick up the latest fixes and refresh the branch.

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