]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 19dba4f 6e20602)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Mar 2015 18:21:23 +0000 (11:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Mar 2015 18:21:23 +0000 (11:21 -0700)
Pull timer fixes from Ingo Molnar:
 "Two clocksource driver fixes, and an idle loop RCU warning fix"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/sun5i: Fix cpufreq interaction with sched_clock()
  clocksource/drivers: Fix various !CONFIG_HAS_IOMEM build errors
  timers/tick/broadcast-hrtimer: Fix suspicious RCU usage in idle loop


Trivial merge
Michael's Linux tree.