tree 9afaa8311ba524f5369f432c30034309f15e3e70
parent 43af9872f52abfed5523b8346d98a5e283b38163
parent c8b5db7de66b75330a96f9f1ad7376b89646c953
author Linus Torvalds <torvalds@linux-foundation.org> 1441147348 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1441147348 -0700

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

Pull x86 clockevent update from Thomas Gleixner:
 "A single commit, which converts HPET clockevents driver to the new
  callbacks"

* 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/hpet: Migrate to new set_state interface