Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 timer updates from Ingo Molnar:
 "Two changes: an LTO improvement, plus the new 'nowatchdog' boot option
  to disable the clocksource watchdog"

* 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/timer: Don't inline __const_udelay()
  x86/tsc: Add option to disable tsc clocksource watchdog

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge