summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-11-26 16:16:58 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-11-26 16:16:58 +1100
commit6a880665bee45f8256c829e2ca91cc66836ddcd8 (patch)
tree55ac0298b8d9dd4877aad807b5734f5404b9c5e5 /scripts
parent4ea24627ec27816c588ddd8f2628eaaacf59db00 (diff)
parent6232ff0d7332a50af0d9e738814b329c9f1f47ad (diff)
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'scripts')
-rw-r--r--scripts/kconfig/mconf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d82953573588..8413cf38ed27 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -213,7 +213,7 @@ load_config_help[] = N_(
"to modify that configuration.\n"
"\n"
"If you are uncertain, then you have probably never used alternate\n"
- "configuration files. You should therefor leave this blank to abort.\n"),
+ "configuration files. You should therefore leave this blank to abort.\n"),
save_config_text[] = N_(
"Enter a filename to which this configuration should be saved "
"as an alternate. Leave blank to abort."),