From 5699ea6d0ee01ab3e41d2cb2ebe2c56a24b9ffff Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Tue, 21 Oct 2014 16:44:32 -0400
Subject: Correct two non-functional misspellings "overrided".

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

diff --git a/dts/Kconfig b/dts/Kconfig
index 83ba7a6..5fe63f8 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -49,7 +49,7 @@ config DEFAULT_DEVICE_TREE
 	string "Default Device Tree for DT control"
 	help
 	  This option specifies the default Device Tree used for DT control.
-	  It can be overrided from the command line:
+	  It can be overridden from the command line:
 	  $ make DEVICE_TREE=<device-tree-name>
 
 endmenu
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 81b0c61..efa4733 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -87,7 +87,7 @@ TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 echo "Using $INITFILE as base"
 cat $INITFILE > $TMP_FILE
 
-# Merge files, printing warnings on overrided values
+# Merge files, printing warnings on overridden values
 for MERGE_FILE in $MERGE_LIST ; do
 	echo "Merging $MERGE_FILE"
 	CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
-- 
cgit v0.10.2