projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c435c1 fe5fba0)
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)
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>
1  2 
arch/x86/kvm/x86.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kvm/x86.c
Simple merge
John Crispins staging tree