Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Aug 2017 22:16:09 +0000 (15:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Aug 2017 22:16:09 +0000 (15:16 -0700)
commit0d5b9944070ab1408b41e55971508d962d7943a0
tree55e23c89c8a44aaf44b8b595d9e7b111ac238a17
parentd1faa3e78a2b11adc9461ebf7593df75cc93bce3
parentbb68cfe2f5a7f43058aed299fdbb73eb281734ed
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fix from Thomas Gleixner:
 "The recent irq core changes unearthed API abuse in the HPET code,
  which manifested itself in a suspend/resume regression.

  The fix replaces the cruft with the proper function calls and cures
  the regression"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/hpet: Cure interface abuse in the resume path