diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
commit | 8b464dc6eec4d1fd58875451671456393181e980 (patch) | |
tree | e97f998a24620c545711a3692be509768407b75d /commands/Kconfig | |
parent | 90118343e46fecac78b6351ce25bb610b15fc077 (diff) | |
parent | 8df8a3d7a9d3356183df0a45c97f32dac878b65b (diff) | |
download | barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.gz barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.xz |
Merge branch 'for-next/doc'
Conflicts:
Makefile
Diffstat (limited to 'commands/Kconfig')
-rw-r--r-- | commands/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 61816f5115..b03f74a82b 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -1859,7 +1859,7 @@ endmenu -menu "Miscelleanous" +menu "Miscellaneous" config CMD_2048 tristate @@ -1976,7 +1976,7 @@ config CMD_TIME Note: This command depends on COMMAND being interruptible, otherwise the timer may overrun resulting in incorrect results -# end Miscelleanous commands +# end Miscellaneous commands endmenu |