]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Dec 2016 00:51:16 +0000 (16:51 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 24 Dec 2016 00:51:16 +0000 (16:51 -0800)
Pull timer fix from Ingo Molnar:
 "ARM/MOXA SoC clocksource driver fixes"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/moxart: Plug memory and mapping leaks


Trivial merge