]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Aug 2016 22:08:31 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Aug 2016 22:08:31 +0000 (15:08 -0700)
commitb061b4f36d2fce94a866e41c68bea782a5673461
tree17f8091eabb8de2ad614e7ad03f19a800c8236c9
parentac78bc714bea30e7f4e84db9d406e85ed309f09d
parentbe5769e2061ac40b32daa83e28e1c4aac7133511
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Ingo Molnar:
 "Three clocksource driver fixes"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/mips-gic-timer: Make gic_clocksource_of_init() return int
  clocksource/drivers/kona: Fix get_counter() error handling
  clocksource/drivers/time-armada-370-xp: Fix the clock reference