projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4e6d7c2aa95158315902647963b359b32da5c295
tree5141f79302e1e653cde53bab6a981a1b7bfa47b0tree | snapshot
parent3c435c1e472ba344ee25f795f4807d4457e61f6ccommit | diff
parentfe5fba05b46c791c95a9f34228ac495f81f72fc0commit | diff
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 diff1 | diff2 | blob | history
John Crispins staging tree