Merge branch 'timers/posix-cpu-timers-for-tglx' of

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>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/x86/kernel/kvmclock.c
Simple merge

diff --cc arch/x86/platform/efi/efi.c
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/time/tick-broadcast.c
Simple merge

diff --cc kernel/time/timekeeping.c
Simple merge