diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:58:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:58:05 -0500 |
| commit | 8b4b6707ee32f929846d947d18b1b9bf42e988aa (patch) | |
| tree | aa27dd01e2d74cb68efc4ab57eb4d1f4e563ae33 /fs/nls | |
| parent | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 (diff) | |
| parent | 116f232b3794a8b6ebde21aef5004b18cc1cfa86 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
fixed path to moved file in include/linux/device.h
Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description
Documentation/dvb/get_dvb_firmware: fix firmware URL
Documentation: Update to BUG-HUNTING
Remove superfluous NOTIFY_COOKIE_LEN define
add "tags" to .gitignore
Fix "frist", "fisrt", typos
fix rwlock usage example
It's UTF-8
Diffstat (limited to 'fs/nls')
| -rw-r--r-- | fs/nls/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nls/Kconfig b/fs/nls/Kconfig index 0ab8f00bdb..976ecccd6f 100644 --- a/fs/nls/Kconfig +++ b/fs/nls/Kconfig | |||
| @@ -491,7 +491,7 @@ config NLS_KOI8_U | |||
| 491 | (koi8-u) and Belarusian (koi8-ru) character sets. | 491 | (koi8-u) and Belarusian (koi8-ru) character sets. |
| 492 | 492 | ||
| 493 | config NLS_UTF8 | 493 | config NLS_UTF8 |
| 494 | tristate "NLS UTF8" | 494 | tristate "NLS UTF-8" |
| 495 | depends on NLS | 495 | depends on NLS |
| 496 | help | 496 | help |
| 497 | If you want to display filenames with native language characters | 497 | If you want to display filenames with native language characters |