X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Documentation%2Fnetworking%2Fbonding.txt;h=e27202bb8d752dd72dead86953976762b78e34be;hb=25985edcedea6396277003854657b5f3cb31a628;hp=b36e741e94dbf9305a55535fa1eaaeed3fa3372e;hpb=1d2a1959fe534279cf37aba20b08c24c20840e52;p=deliverable%2Flinux.git

diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index b36e741e94db..e27202bb8d75 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -368,7 +368,7 @@ fail_over_mac
 		gratuitous ARP is lost, communication may be
 		disrupted.
 
-		When this policy is used in conjuction with the mii
+		When this policy is used in conjunction with the mii
 		monitor, devices which assert link up prior to being
 		able to actually transmit and receive are particularly
 		susceptible to loss of the gratuitous ARP, and an