diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-17 11:11:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-12-17 11:11:08 -0800 |
commit | 2abf193275768ac89f5d93eec7bcacb238168151 (patch) | |
tree | df4fd5c05f2d0794cf48b81fda5b39cfb57f8a5f /fs/xfs/xfs_log.h | |
parent | 4340ebd19ff031fd97a69ea7e7249c898f2d3e06 (diff) | |
parent | e0748539e3d594dd26f0d27a270f14720b22a406 (diff) |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Add HPET quirks for the Intel 'Coffee Lake H' and 'Ice Lake' platforms"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/intel: Disable HPET on Intel Ice Lake platforms
x86/intel: Disable HPET on Intel Coffee Lake H platforms
Diffstat (limited to 'fs/xfs/xfs_log.h')
0 files changed, 0 insertions, 0 deletions