diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 10:09:21 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 10:09:21 +0100 |
| commit | 4e6d7c2aa95158315902647963b359b32da5c295 (patch) | |
| tree | 5141f79302e1e653cde53bab6a981a1b7bfa47b0 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| parent | time: Add ktime_get_tai_ns() (diff) | |
| download | linux-4e6d7c2aa95158315902647963b359b32da5c295.tar.gz linux-4e6d7c2aa95158315902647963b359b32da5c295.zip | |
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>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions