Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 24 Apr 2013 18:33:46 +0000 (20:33 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 24 Apr 2013 18:33:54 +0000 (20:33 +0200)
commit6402c7dc2a19c19bd8cdc7d80878b850da418942
treecda2ea2df40442e2aa016119f3548cc504127ea8
parent77c675ba18836802f6b73d2d773481d06ebc0f04
parent60d509fa6a9c4653a86ad830e4c4b30360b23f0e
Merge branch 'linus' into timers/core
Reason: Get upstream fixes before adding conflicting code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/Kconfig
arch/x86/platform/efi/efi.c
include/linux/sched.h
kernel/hrtimer.c
kernel/time/tick-broadcast.c