diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
| commit | e8b9dd7e2471b1274e3be719fcc385e0a710e46f (patch) | |
| tree | 030d7ce20e8f8767d9423f78c102aba089eec372 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge branch 'nohz-for-tip-2' of git://github.com/fweisbec/linux-dynticks into timers/core (diff) | |
| parent | ntp: Fix STA_INS/DEL clearing bug (diff) | |
| download | wireguard-linux-e8b9dd7e2471b1274e3be719fcc385e0a710e46f.tar.xz wireguard-linux-e8b9dd7e2471b1274e3be719fcc385e0a710e46f.zip | |
Merge branch 'timers/urgent' into timers/core
Reason: Update to upstream changes to avoid further conflicts.
Fixup a trivial merge conflict in kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions