]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Dec 2015 20:36:23 +0000 (12:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Dec 2015 20:36:23 +0000 (12:36 -0800)
Pull timer fix from Thomas Gleixner:
 "A single fix to unbreak a clocksource driver which has more than 32bit
  counter width"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: Mmio: remove artificial 32bit limitation


Trivial merge