Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jul 2014 20:11:02 +0000 (10:11 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jul 2014 20:11:02 +0000 (10:11 -1000)
Pull scheduler fixes from Ingo Molnar:
 "A cpufreq lockup fix and a compiler warning fix"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix compiler warnings
  x86, tsc: Fix cpufreq lockup


Trivial merge