]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'timers/core' into perf/timer, to apply dependent patch
authorIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 09:09:21 +0000 (10:09 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 27 Mar 2015 09:09:21 +0000 (10:09 +0100)
commitfa1faecbca9aa1a07b0f5f956439e0a7730b1388
tree5141f79302e1e653cde53bab6a981a1b7bfa47b0
parentb2c79b6cdda0390aed463274685121d0cc64e0e1
parent763e640bd4de3690957cb855eb9ad2d6de567f69
Merge branch 'timers/core' into perf/timer, to apply dependent patch

An upcoming patch will depend on tai_ns() and NMI-safe ktime_get_raw_fast(),
so merge timers/core here in a separate topic branch until it's all cooked
and timers/core is merged upstream.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kvm/x86.c