Merge ../linus

[linux-drm-fsl-dcu.git] / Documentation / networking / decnet.txt

diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index e6c39c5831f5f4059ebfbeefb597991221185543..badb7480ea6282904d7ff648629262fa0f632a97 100644 (file)
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -82,7 +82,7 @@ ethernet address of your ethernet card has to be set according to the DECnet
 address of the node in order for it to be autoconfigured (and then appear in
 /proc/net/decnet_dev). There is a utility available at the above
 FTP sites called dn2ethaddr which can compute the correct ethernet
-address to use. The address can be set by ifconfig either before at
+address to use. The address can be set by ifconfig either before or
 at the time the device is brought up. If you are using RedHat you can
 add the line: