diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-14 12:50:27 -0400 |
| commit | d0bbe0dd353af9521e9d8bc5236308c677b6f62a (patch) | |
| tree | a1142f3a5058d16504863ac777b21efdf1eca49e /init | |
| parent | 8de29a35dc840a05e451ad035bcb06e21ccf605f (diff) | |
| parent | 0e4f93e5017d9d8080bbd34db17836e090eb46fe (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Usual trivial tree updates. Nothing outstanding -- mostly printk()
and comment fixes and unused identifier removals"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
goldfish: goldfish_tty_probe() is not using 'i' any more
powerpc: Fix comment in smu.h
qla2xxx: Fix printks in ql_log message
lib: correct link to the original source for div64_u64
si2168, tda10071, m88ds3103: Fix firmware wording
usb: storage: Fix printk in isd200_log_config()
qla2xxx: Fix printk in qla25xx_setup_mode
init/main: fix reset_device comment
ipwireless: missing assignment
goldfish: remove unreachable line of code
coredump: Fix do_coredump() comment
stacktrace.h: remove duplicate declaration task_struct
smpboot.h: Remove unused function prototype
treewide: Fix typo in printk messages
treewide: Fix typo in printk messages
mod_devicetable: fix comment for match_flags
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 4a6974e67839..54565bf57beb 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -143,7 +143,7 @@ EXPORT_SYMBOL_GPL(static_key_initialized); | |||
| 143 | * rely on the BIOS and skip the reset operation. | 143 | * rely on the BIOS and skip the reset operation. |
| 144 | * | 144 | * |
| 145 | * This is useful if kernel is booting in an unreliable environment. | 145 | * This is useful if kernel is booting in an unreliable environment. |
| 146 | * For ex. kdump situaiton where previous kernel has crashed, BIOS has been | 146 | * For ex. kdump situation where previous kernel has crashed, BIOS has been |
| 147 | * skipped and devices will be in unknown state. | 147 | * skipped and devices will be in unknown state. |
| 148 | */ | 148 | */ |
| 149 | unsigned int reset_devices; | 149 | unsigned int reset_devices; |