Merge branch 'timers/posix-cpu-timers-for-tglx' of
authorThomas Gleixner <tglx@linutronix.de>
Thu, 4 Jul 2013 21:11:22 +0000 (23:11 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 4 Jul 2013 21:11:22 +0000 (23:11 +0200)
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/core

Frederic sayed: "Most of these patches have been hanging around for
several month now, in -mmotm for a significant chunk. They already
missed a few releases."

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
1  2 
arch/arm/Kconfig
arch/x86/kernel/kvmclock.c
arch/x86/platform/efi/efi.c
init/Kconfig
kernel/time/tick-broadcast.c
kernel/time/timekeeping.c

Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge
Simple merge