tree b1d45b523813129563f43056f2c20ec72228b263
parent 4907cdca7210c5895311bddcf05a4c85b67d8566
parent 224aa3ed45c8735ae02bb2ecca002409fa6aa772
author Linus Torvalds <torvalds@linux-foundation.org> 1395245138 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1395245138 -0700

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

Pull timer fix from Thomas Gleixner:
 "A single bugfix: make the scheduler clock on Vybrid SoCs count
  forward"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource: vf_pit_timer: use complement for sched_clock reading