diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 11:12:25 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 11:12:25 -0800 |
commit | a9042defa29a01cc538b742eab047848e9b5ae14 (patch) | |
tree | 8990e86b37831ef58dfb0c7dd3459a51a435af01 /tools/power | |
parent | 6960d58240190a885c09e784b8dcc1345951a7c8 (diff) | |
parent | 74dcba3589fc184c7118905eda22b3a4aaef95ff (diff) | |
download | linux-a9042defa29a01cc538b742eab047848e9b5ae14.tar.gz linux-a9042defa29a01cc538b742eab047848e9b5ae14.tar.bz2 linux-a9042defa29a01cc538b742eab047848e9b5ae14.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
NTB: correct ntb_spad_count comment typo
misc: ibmasm: fix typo in error message
Remove references to dead make variable LINUX_INCLUDE
Remove last traces of ikconfig.h
treewide: Fix printk() message errors
Documentation/device-mapper: s/getsize/getsz/
Diffstat (limited to 'tools/power')
-rw-r--r-- | tools/power/acpi/tools/ec/ec_access.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/acpi/tools/ec/ec_access.c b/tools/power/acpi/tools/ec/ec_access.c index 6b8aaed44f2c..5f50642386db 100644 --- a/tools/power/acpi/tools/ec/ec_access.c +++ b/tools/power/acpi/tools/ec/ec_access.c @@ -46,7 +46,7 @@ void usage(char progname[], int exit_status) puts("\t-b offset : Read value at byte_offset (in hex)"); puts("\t-w offset -v value : Write value at byte_offset"); puts("\t-h : Print this help\n\n"); - puts("Offsets and values are in hexadecimal number sytem."); + puts("Offsets and values are in hexadecimal number system."); puts("The offset and value must be between 0 and 0xff."); exit(exit_status); } |