From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Aug 2017 22:16:09 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~336
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0d5b9944070ab1408b41e55971508d962d7943a0;p=platform%2Fkernel%2Flinux-rpi3.git

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
---

0d5b9944070ab1408b41e55971508d962d7943a0