diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-13 18:32:13 -0400 |
| commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
| tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /arch/um | |
| parent | aec995900fbc8cffa9f0f9e797ef07a0beb2b079 (diff) | |
| parent | 7db6a7fa09884b34d2a5d4e6e4ed58664a5f0cf8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Kconfig.net | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Kconfig.net b/arch/um/Kconfig.net index 9e9a4aaa703d..3160b1a5adb7 100644 --- a/arch/um/Kconfig.net +++ b/arch/um/Kconfig.net | |||
| @@ -186,7 +186,7 @@ config UML_NET_SLIRP | |||
| 186 | other transports, SLiRP works without the need of root level | 186 | other transports, SLiRP works without the need of root level |
| 187 | privleges, setuid binaries, or SLIP devices on the host. This | 187 | privleges, setuid binaries, or SLIP devices on the host. This |
| 188 | also means not every type of connection is possible, but most | 188 | also means not every type of connection is possible, but most |
| 189 | situations can be accomodated with carefully crafted slirp | 189 | situations can be accommodated with carefully crafted slirp |
| 190 | commands that can be passed along as part of the network device's | 190 | commands that can be passed along as part of the network device's |
| 191 | setup string. The effect of this transport on the UML is similar | 191 | setup string. The effect of this transport on the UML is similar |
| 192 | that of a host behind a firewall that masquerades all network | 192 | that of a host behind a firewall that masquerades all network |