kconfig: fix a misspelling in scripts/kconfig/merge_config.sh
authorMasahiro Yamada <yamada.m@jp.panasonic.com>
Wed, 3 Dec 2014 06:55:49 +0000 (15:55 +0900)
committerMichal Marek <mmarek@suse.cz>
Wed, 25 Feb 2015 13:59:14 +0000 (14:59 +0100)
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
scripts/kconfig/merge_config.sh

Simple merge