Merge branch 'timers/core' into perf/timer, to apply dependent patch
authorIngo Molnar <[email protected]>
Fri, 27 Mar 2015 09:09:21 +0000 (10:09 +0100)
committerIngo Molnar <[email protected]>
Fri, 27 Mar 2015 09:09:21 +0000 (10:09 +0100)
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 <[email protected]>
1  2 
arch/x86/kvm/x86.c

Simple merge