aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/bench/sched-pipe.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-18 23:01:55 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-18 23:01:55 -0700
commit2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (patch)
treefa7f8400ac685fb52e96f64997c7c682fc2aa021 /tools/perf/bench/sched-pipe.c
parent7b39f90fabcf9e2af0cd79d0a60440d821e22b56 (diff)
parent537b60d17894b7c19a6060feae40299d7109d6e7 (diff)
downloadkernel_samsung_smdk4412-2ec8c6bb5d8f3a62a79f463525054bae1e3d4487.tar.gz
kernel_samsung_smdk4412-2ec8c6bb5d8f3a62a79f463525054bae1e3d4487.tar.bz2
kernel_samsung_smdk4412-2ec8c6bb5d8f3a62a79f463525054bae1e3d4487.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c
Diffstat (limited to 'tools/perf/bench/sched-pipe.c')
-rw-r--r--tools/perf/bench/sched-pipe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/bench/sched-pipe.c b/tools/perf/bench/sched-pipe.c
index 4f77c7c2764..d9ab3ce446a 100644
--- a/tools/perf/bench/sched-pipe.c
+++ b/tools/perf/bench/sched-pipe.c
@@ -93,7 +93,7 @@ int bench_sched_pipe(int argc, const char **argv,
switch (bench_format) {
case BENCH_FORMAT_DEFAULT:
- printf("# Extecuted %d pipe operations between two tasks\n\n",
+ printf("# Executed %d pipe operations between two tasks\n\n",
loops);
result_usec = diff.tv_sec * 1000000;