Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/hrtimer-2.6