Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (31 commits) trivial: remove the trivial patch monkey's name from SubmittingPatches trivial: Fix a typo in comment of addrconf_dad_start() trivial: usb: fix missing space typo in doc trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug trivial: Remove the hyphen from git commands trivial: fix ETIMEOUT -> ETIMEDOUT typos trivial: Kconfig: .ko is normally not included in module names trivial: SubmittingPatches: fix typo trivial: Documentation/dell_rbu.txt: fix typos trivial: Fix Pavel's address in MAINTAINERS trivial: ftrace:fix description of trace directory trivial: unnecessary (void*) cast removal in sound/oss/msnd.c trivial: input/misc: Fix typo in Kconfig trivial: fix grammo in bus_for_each_dev() kerneldoc trivial: rbtree.txt: fix rb_entry() parameters in sample code trivial: spelling fix in ppc code comments trivial: fix typo in bio_alloc kernel doc trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt trivial: Miscellaneous documentation typo fixes trivial: fix typo milisecond/millisecond for documentation and source comments. ...
This commit is contained in:
@@ -531,7 +531,7 @@ config SBC8360_WDT
|
||||
Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called sbc8360.ko.
|
||||
module will be called sbc8360.
|
||||
|
||||
Most people will say N.
|
||||
|
||||
|
@@ -192,7 +192,7 @@ static int iop_wdt_release(struct inode *inode, struct file *file)
|
||||
if (test_bit(WDT_ENABLED, &wdt_status))
|
||||
state = wdt_disable();
|
||||
|
||||
/* if the timer is not disbaled reload and notify that we are still
|
||||
/* if the timer is not disabled reload and notify that we are still
|
||||
* going down
|
||||
*/
|
||||
if (state != 0) {
|
||||
|
Reference in New Issue
Block a user