diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 15:00:02 -0500 |
commit | a2013a13e68354e0c8f3696b69701803e13fb737 (patch) | |
tree | a7e1da6bfad1aa2afd83f401874d606269ce90b4 /Documentation/ABI | |
parent | dadfab4873256d2145640c0ce468fcbfb48977fe (diff) | |
parent | 106f9d9337f65bd428c0c79f650e3489e458d771 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial branch from Jiri Kosina:
"Usual stuff -- comment/printk typo fixes, documentation updates, dead
code elimination."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
HOWTO: fix double words typo
x86 mtrr: fix comment typo in mtrr_bp_init
propagate name change to comments in kernel source
doc: Update the name of profiling based on sysfs
treewide: Fix typos in various drivers
treewide: Fix typos in various Kconfig
wireless: mwifiex: Fix typo in wireless/mwifiex driver
messages: i2o: Fix typo in messages/i2o
scripts/kernel-doc: check that non-void fcts describe their return value
Kernel-doc: Convention: Use a "Return" section to describe return values
radeon: Fix typo and copy/paste error in comments
doc: Remove unnecessary declarations from Documentation/accounting/getdelays.c
various: Fix spelling of "asynchronous" in comments.
Fix misspellings of "whether" in comments.
eisa: Fix spelling of "asynchronous".
various: Fix spelling of "registered" in comments.
doc: fix quite a few typos within Documentation
target: iscsi: fix comment typos in target/iscsi drivers
treewide: fix typo of "suport" in various comments and Kconfig
treewide: fix typo of "suppport" in various comments
...
Diffstat (limited to 'Documentation/ABI')
-rw-r--r-- | Documentation/ABI/testing/dev-kmsg | 2 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-devices-power | 2 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-driver-ppi | 2 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-profiling | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/ABI/testing/dev-kmsg b/Documentation/ABI/testing/dev-kmsg index 7e7e07a82e0e..bb820be48179 100644 --- a/Documentation/ABI/testing/dev-kmsg +++ b/Documentation/ABI/testing/dev-kmsg | |||
@@ -92,7 +92,7 @@ Description: The /dev/kmsg character device node provides userspace access | |||
92 | The flags field carries '-' by default. A 'c' indicates a | 92 | The flags field carries '-' by default. A 'c' indicates a |
93 | fragment of a line. All following fragments are flagged with | 93 | fragment of a line. All following fragments are flagged with |
94 | '+'. Note, that these hints about continuation lines are not | 94 | '+'. Note, that these hints about continuation lines are not |
95 | neccessarily correct, and the stream could be interleaved with | 95 | necessarily correct, and the stream could be interleaved with |
96 | unrelated messages, but merging the lines in the output | 96 | unrelated messages, but merging the lines in the output |
97 | usually produces better human readable results. A similar | 97 | usually produces better human readable results. A similar |
98 | logic is used internally when messages are printed to the | 98 | logic is used internally when messages are printed to the |
diff --git a/Documentation/ABI/testing/sysfs-devices-power b/Documentation/ABI/testing/sysfs-devices-power index 7fc2997b23a6..9d43e7670841 100644 --- a/Documentation/ABI/testing/sysfs-devices-power +++ b/Documentation/ABI/testing/sysfs-devices-power | |||
@@ -164,7 +164,7 @@ Contact: Rafael J. Wysocki <rjw@sisk.pl> | |||
164 | Description: | 164 | Description: |
165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute | 165 | The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute |
166 | contains the total time the device has been preventing | 166 | contains the total time the device has been preventing |
167 | opportunistic transitions to sleep states from occuring. | 167 | opportunistic transitions to sleep states from occurring. |
168 | This attribute is read-only. If the device is not enabled to | 168 | This attribute is read-only. If the device is not enabled to |
169 | wake up the system from sleep states, this attribute is not | 169 | wake up the system from sleep states, this attribute is not |
170 | present. | 170 | present. |
diff --git a/Documentation/ABI/testing/sysfs-driver-ppi b/Documentation/ABI/testing/sysfs-driver-ppi index 97a003ee058b..7d1435bc976c 100644 --- a/Documentation/ABI/testing/sysfs-driver-ppi +++ b/Documentation/ABI/testing/sysfs-driver-ppi | |||
@@ -5,7 +5,7 @@ Contact: xiaoyan.zhang@intel.com | |||
5 | Description: | 5 | Description: |
6 | This folder includes the attributes related with PPI (Physical | 6 | This folder includes the attributes related with PPI (Physical |
7 | Presence Interface). Only if TPM is supported by BIOS, this | 7 | Presence Interface). Only if TPM is supported by BIOS, this |
8 | folder makes sence. The folder path can be got by command | 8 | folder makes sense. The folder path can be got by command |
9 | 'find /sys/ -name 'pcrs''. For the detail information of PPI, | 9 | 'find /sys/ -name 'pcrs''. For the detail information of PPI, |
10 | please refer to the PPI specification from | 10 | please refer to the PPI specification from |
11 | http://www.trustedcomputinggroup.org/ | 11 | http://www.trustedcomputinggroup.org/ |
diff --git a/Documentation/ABI/testing/sysfs-profiling b/Documentation/ABI/testing/sysfs-profiling index b02d8b8c173a..8a8e466eb2c0 100644 --- a/Documentation/ABI/testing/sysfs-profiling +++ b/Documentation/ABI/testing/sysfs-profiling | |||
@@ -1,13 +1,13 @@ | |||
1 | What: /sys/kernel/profile | 1 | What: /sys/kernel/profiling |
2 | Date: September 2008 | 2 | Date: September 2008 |
3 | Contact: Dave Hansen <dave@linux.vnet.ibm.com> | 3 | Contact: Dave Hansen <dave@linux.vnet.ibm.com> |
4 | Description: | 4 | Description: |
5 | /sys/kernel/profile is the runtime equivalent | 5 | /sys/kernel/profiling is the runtime equivalent |
6 | of the boot-time profile= option. | 6 | of the boot-time profile= option. |
7 | 7 | ||
8 | You can get the same effect running: | 8 | You can get the same effect running: |
9 | 9 | ||
10 | echo 2 > /sys/kernel/profile | 10 | echo 2 > /sys/kernel/profiling |
11 | 11 | ||
12 | as you would by issuing profile=2 on the boot | 12 | as you would by issuing profile=2 on the boot |
13 | command line. | 13 | command line. |