History

Merge branch 'for-next' into for-linus

Conflicts: kernel/irq/chip.c

Jiri Kosina committed 16 years ago

Commit d014d042 parents 6ec22f9 6070d81490 files · +721 −832Browse files

Showing the changes to scripts (1 of 490 files). Show all

Unified · Split

scripts/kconfig/mconf.c+1−1
@@ -213,7 +213,7 @@ load_config_help[] = N_( · 212 unmodified lines
213213 "to modify that configuration.\n"
214214 "\n"
215215 "If you are uncertain, then you have probably never used alternate\n"
216− "configuration files. You should therefor leave this blank to abort.\n"),
216+ "configuration files. You should therefore leave this blank to abort.\n"),
217217 save_config_text[] = N_(
218218 "Enter a filename to which this configuration should be saved "
219219 "as an alternate. Leave blank to abort."),