diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-01 21:00:25 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-01 21:00:25 +0100 |
commit | 640c0f5c57864cbc1f495509bdc879fab94d4d9d (patch) | |
tree | ee1e68209cf3a1ad5ff6edfcc684ee3724c5af7b /arch/x86/kernel/cpu/intel.c | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | Merge branch 'clockevents/4.0-rc1' of git://git.linaro.org/people/daniel.lezc... (diff) | |
download | linux-640c0f5c57864cbc1f495509bdc879fab94d4d9d.tar.xz linux-640c0f5c57864cbc1f495509bdc879fab94d4d9d.zip |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Three clockevents/clocksource driver fixes"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clocksource: pxa: Fix section mismatch
clocksource: mtk: Fix race conditions in probe code
clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig
Diffstat (limited to 'arch/x86/kernel/cpu/intel.c')
0 files changed, 0 insertions, 0 deletions