Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

2 files changed, 3 insertions, 4 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index c91874d25e54..1024ae158227 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -840,7 +840,7 @@ static int ad_lacpdu_send(struct port *port)
         lacpdu_header = (struct lacpdu_header *)skb_put(skb, length);
 
         memcpy(lacpdu_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN);
-        /* Note: source addres is set to be the member's PERMANENT address,
+        /* Note: source address is set to be the member's PERMANENT address,
            because we use it to identify loopback lacpdus in receive. */
         memcpy(lacpdu_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN);
         lacpdu_header->hdr.h_proto = PKT_TYPE_LACPDU;
@@ -881,7 +881,7 @@ static int ad_marker_send(struct port *port, struct bond_marker *marker)
         marker_header = (struct bond_marker_header *)skb_put(skb, length);
 
         memcpy(marker_header->hdr.h_dest, lacpdu_mcast_addr, ETH_ALEN);
-        /* Note: source addres is set to be the member's PERMANENT address,
+        /* Note: source address is set to be the member's PERMANENT address,
            because we use it to identify loopback MARKERs in receive. */
         memcpy(marker_header->hdr.h_source, slave->perm_hwaddr, ETH_ALEN);
         marker_header->hdr.h_proto = PKT_TYPE_LACPDU;
@@ -1916,7 +1916,7 @@ int bond_3ad_bind_slave(struct slave *slave)
                 return -1;
         }
 
-        //check that the slave has not been intialized yet.
+        //check that the slave has not been initialized yet.
         if (SLAVE_AD_INFO(slave).port.slave != slave) {
 
                 // port initialization
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 4da384cc7603..31fe980e4e28 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -18,7 +18,6 @@
 #include <linux/timer.h>
 #include <linux/proc_fs.h>
 #include <linux/if_bonding.h>
-#include <linux/kobject.h>
 #include <linux/cpumask.h>
 #include <linux/in6.h>
 #include "bond_3ad.h"