| commit | 4e6d7c2aa95158315902647963b359b32da5c295 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Mar 27 10:09:21 2015 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Mar 27 10:09:21 2015 +0100 |
| tree | 5141f79302e1e653cde53bab6a981a1b7bfa47b0 | |
| parent | 3c435c1e472ba344ee25f795f4807d4457e61f6c [diff] | |
| parent | fe5fba05b46c791c95a9f34228ac495f81f72fc0 [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>