| commit | 0d5b9944070ab1408b41e55971508d962d7943a0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 04 15:16:09 2017 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 04 15:16:09 2017 -0700 |
| tree | 55e23c89c8a44aaf44b8b595d9e7b111ac238a17 | |
| parent | d1faa3e78a2b11adc9461ebf7593df75cc93bce3 [diff] | |
| parent | bb68cfe2f5a7f43058aed299fdbb73eb281734ed [diff] |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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