Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Aug 2013 16:17:35 +0000 (09:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Aug 2013 16:17:35 +0000 (09:17 -0700)
Pull timer fixes from Ingo Molnar:
 "Three small fixlets"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  nohz: fix compile warning in tick_nohz_init()
  nohz: Do not warn about unstable tsc unless user uses nohz_full
  sched_clock: Fix integer overflow

1  2 
kernel/time/tick-sched.c

Simple merge