tree 17f8091eabb8de2ad614e7ad03f19a800c8236c9
parent ac78bc714bea30e7f4e84db9d406e85ed309f09d
parent be5769e2061ac40b32daa83e28e1c4aac7133511
author Linus Torvalds <torvalds@linux-foundation.org> 1471558111 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1471558111 -0700

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