| commit | a5532439ebab93e47784effb96aafa7d7ba4b760 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 02 16:18:31 2018 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Apr 02 16:18:31 2018 -0700 |
| tree | 82a8e88870ec995a3139d0afdfe246407db44ad6 | |
| parent | cea061e455c88312b86142e68c8fc5b8e1294ca2 [diff] | |
| parent | ea89c065482179b2bf9f9b6788b06a6e0c68a73b [diff] |
Merge branch 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 timer updates from Ingo Molnar: "Two changes: add the new convert_art_ns_to_tsc() API for upcoming Intel Goldmont+ drivers, and remove the obsolete rdtscll() API" * 'x86-timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/tsc: Get rid of rdtscll() x86/tsc: Convert ART in nanoseconds to TSC