diff options
| author | James Morris <jmorris@namei.org> | 2011-01-09 17:46:24 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-01-09 17:46:24 -0500 |
| commit | d2e7ad19229f982fc1eb731827d82ceac90abfb3 (patch) | |
| tree | 98a3741b4d4b27a48b3c7ea9babe331e539416a8 /tools/perf/scripts/python/sched-migration.py | |
| parent | d03a5d888fb688c832d470b749acc5ed38e0bc1d (diff) | |
| parent | 0c21e3aaf6ae85bee804a325aa29c325209180fd (diff) | |
Merge branch 'master' into next
Conflicts:
security/smack/smack_lsm.c
Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'tools/perf/scripts/python/sched-migration.py')
| -rw-r--r-- | tools/perf/scripts/python/sched-migration.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/scripts/python/sched-migration.py b/tools/perf/scripts/python/sched-migration.py index b934383c336..74d55ec08ae 100644 --- a/tools/perf/scripts/python/sched-migration.py +++ b/tools/perf/scripts/python/sched-migration.py | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | # | 4 | # |
| 5 | # Copyright (C) 2010 Frederic Weisbecker <fweisbec@gmail.com> | 5 | # Copyright (C) 2010 Frederic Weisbecker <fweisbec@gmail.com> |
| 6 | # | 6 | # |
| 7 | # perf trace event handlers have been generated by perf trace -g python | 7 | # perf script event handlers have been generated by perf script -g python |
| 8 | # | 8 | # |
| 9 | # This software is distributed under the terms of the GNU General | 9 | # This software is distributed under the terms of the GNU General |
| 10 | # Public License ("GPL") version 2 as published by the Free Software | 10 | # Public License ("GPL") version 2 as published by the Free Software |