diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:12:25 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-09 14:12:25 +1100 |
| commit | 0977974f60ffa341a89e12e8fc5640094eeef4a9 (patch) | |
| tree | 2447b939fabdb3b480d8a96d5beb4b6b3602746a /arch/h8300 | |
| parent | f64b6501aab19d1e2842b5cf9ff8e37a98c8f67a (diff) | |
| parent | fa9f90be745d3b600a9d97a063be404c5e5d9071 (diff) | |
Merge remote branch 'trivial/for-next'
Conflicts:
MAINTAINERS
drivers/scsi/bfa/bfa_fcpim.c
Diffstat (limited to 'arch/h8300')
| -rw-r--r-- | arch/h8300/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/h8300/Kconfig.debug b/arch/h8300/Kconfig.debug index ee671c3f2c74..e8d1b236ad8c 100644 --- a/arch/h8300/Kconfig.debug +++ b/arch/h8300/Kconfig.debug @@ -48,7 +48,7 @@ config DEFAULT_CMDLINE builtin kernel commandline enabled. config KERNEL_COMMAND - string "Buildin commmand string" + string "Buildin command string" depends on DEFAULT_CMDLINE help builtin kernel commandline strings. |