aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 12:46:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-23 12:46:49 -0700
commit927ad551031798d4cba49766549600bbb33872d7 (patch)
treecdd061600ba4654a52591c67ad5868dfa98e1474
parentMerge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentktest: Change singular "paranthesis" to plural "parentheses" (diff)
downloadlinux-dev-927ad551031798d4cba49766549600bbb33872d7.tar.xz
linux-dev-927ad551031798d4cba49766549600bbb33872d7.zip
Merge tag 'ktest-v3.5-spelling' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest
Pull trivial ktest spelling fix from Steven Rostedt: "I promised Jesper that I would push this for 3.5, but forgot to add it to my queue. It's just a spelling fix, but it should go in regardless to hide my inability to get words in the English language correct." Becuse gud spealing is impurtunt. * tag 'ktest-v3.5-spelling' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest: ktest: Change singular "paranthesis" to plural "parentheses"
-rw-r--r--tools/testing/ktest/sample.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index 0e8191b6c5e3..cf362b3d1ec9 100644
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -158,7 +158,7 @@
#
# TEST_START IF (DEFINED ALL_TESTS || ${MYTEST} == boottest) && ${MACHINE} == gandalf
#
-# Notice the use of paranthesis. Without any paranthesis the above would be
+# Notice the use of parentheses. Without any parentheses the above would be
# processed the same as:
#
# TEST_START IF DEFINED ALL_TESTS || (${MYTEST} == boottest && ${MACHINE} == gandalf)