aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/scripts/python
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2008-10-20 11:37:58 +0900
committerPaul Mundt <lethal@linux-sh.org>2008-10-20 11:37:58 +0900
commit9a19eb2a6607f2f6329efb3c4637fe23afae2cd7 (patch)
treec730bca14d2c6ea8b5e8778e15bd1c219c554d4b /tools/perf/scripts/python
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff)
sh: Fix up some merge damage.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions