diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /scripts/kconfig | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'scripts/kconfig')
| -rw-r--r-- | scripts/kconfig/mconf.c | 2 |
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_( | |||
| 213 | "to modify that configuration.\n" | 213 | "to modify that configuration.\n" |
| 214 | "\n" | 214 | "\n" |
| 215 | "If you are uncertain, then you have probably never used alternate\n" | 215 | "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"), |
| 217 | save_config_text[] = N_( | 217 | save_config_text[] = N_( |
| 218 | "Enter a filename to which this configuration should be saved " | 218 | "Enter a filename to which this configuration should be saved " |
| 219 | "as an alternate. Leave blank to abort."), | 219 | "as an alternate. Leave blank to abort."), |