diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 12:36:50 -0400 |
commit | 5d434fcb255dec99189f1c58a06e4f56e12bf77d (patch) | |
tree | 734289dc85074903d9e636a935d43414746e222c /tools | |
parent | 5a5a1bf099d6942399ea0b34a62e5f0bc4c5c36e (diff) | |
parent | 071361d3473ebb8142907470ff12d59c59f6be72 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual stuff, mostly comment fixes, typo fixes, printk fixes and small
code cleanups"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (45 commits)
mm: Convert print_symbol to %pSR
gfs2: Convert print_symbol to %pSR
m32r: Convert print_symbol to %pSR
iostats.txt: add easy-to-find description for field 6
x86 cmpxchg.h: fix wrong comment
treewide: Fix typo in printk and comments
doc: devicetree: Fix various typos
docbook: fix 8250 naming in device-drivers
pata_pdc2027x: Fix compiler warning
treewide: Fix typo in printks
mei: Fix comments in drivers/misc/mei
treewide: Fix typos in kernel messages
pm44xx: Fix comment for "CONFIG_CPU_IDLE"
doc: Fix typo "CONFIG_CGROUP_CGROUP_MEMCG_SWAP"
mmzone: correct "pags" to "pages" in comment.
kernel-parameters: remove outdated 'noresidual' parameter
Remove spurious _H suffixes from ifdef comments
sound: Remove stray pluses from Kconfig file
radio-shark: Fix printk "CONFIG_LED_CLASS"
doc: put proper reference to CONFIG_MODULE_SIG_ENFORCE
...
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/tests/attr.c | 2 | ||||
-rw-r--r-- | tools/perf/tests/parse-events.c | 2 | ||||
-rw-r--r-- | tools/power/cpupower/debug/i386/intel_gsic.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/tests/attr.c b/tools/perf/tests/attr.c index 038de3ecb8cb..00218f503b2e 100644 --- a/tools/perf/tests/attr.c +++ b/tools/perf/tests/attr.c | |||
@@ -178,6 +178,6 @@ int test__attr(void) | |||
178 | !lstat(path_perf, &st)) | 178 | !lstat(path_perf, &st)) |
179 | return run_dir(path_dir, path_perf); | 179 | return run_dir(path_dir, path_perf); |
180 | 180 | ||
181 | fprintf(stderr, " (ommitted)"); | 181 | fprintf(stderr, " (omitted)"); |
182 | return 0; | 182 | return 0; |
183 | } | 183 | } |
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index 88e2f44cb157..0275bab4ea9e 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c | |||
@@ -1321,7 +1321,7 @@ static int test_pmu_events(void) | |||
1321 | 1321 | ||
1322 | ret = stat(path, &st); | 1322 | ret = stat(path, &st); |
1323 | if (ret) { | 1323 | if (ret) { |
1324 | pr_debug("ommiting PMU cpu events tests\n"); | 1324 | pr_debug("omitting PMU cpu events tests\n"); |
1325 | return 0; | 1325 | return 0; |
1326 | } | 1326 | } |
1327 | 1327 | ||
diff --git a/tools/power/cpupower/debug/i386/intel_gsic.c b/tools/power/cpupower/debug/i386/intel_gsic.c index 53f5293c9c9a..d032c826d42e 100644 --- a/tools/power/cpupower/debug/i386/intel_gsic.c +++ b/tools/power/cpupower/debug/i386/intel_gsic.c | |||
@@ -66,7 +66,7 @@ int main (void) | |||
66 | printf("ecx = 0x%.8x\n", r.ecx); | 66 | printf("ecx = 0x%.8x\n", r.ecx); |
67 | printf("edx = 0x%.8x\n", r.edx); | 67 | printf("edx = 0x%.8x\n", r.edx); |
68 | printf("Note also that some BIOS do not support the initial " | 68 | printf("Note also that some BIOS do not support the initial " |
69 | "GSIC call, but the newer\nspeeedstep-smi driver may " | 69 | "GSIC call, but the newer\nspeedstep-smi driver may " |
70 | "work.\nFor this, you need to pass some arguments to " | 70 | "work.\nFor this, you need to pass some arguments to " |
71 | "the speedstep-smi driver:\n"); | 71 | "the speedstep-smi driver:\n"); |
72 | printf("\tsmi_cmd=0x?? smi_port=0x?? smi_sig=1\n"); | 72 | printf("\tsmi_cmd=0x?? smi_port=0x?? smi_sig=1\n"); |