tree d973e31999a6e36ffa681d13473c6d3f0db5284e
parent 907977b2a22c5d1f465fbe9657d0003f057f9b1e
parent 8d09617b076fd03ee9ae124abce94dda17bf3723
author Linus Torvalds <torvalds@linux-foundation.org> 1491150123 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1491150123 -0700

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "Two small fixes for the new CLKEVT_OF infrastructure"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  vmlinux.lds: Add __clkevt_of_table to kernel
  clockevents: Fix syntax error in clkevt-of macro