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

diff --combined drivers/net/bonding/bond_3ad.c
index c91874d,171782e..1024ae1
--- 1/drivers/net/bonding/bond_3ad.c
--- 2/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@@ -840,7 -840,7 +840,7 @@@ static int ad_lacpdu_send(struct 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 +881,7 @@@ static int ad_marker_send(struct port *
        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 +1916,7 @@@ int bond_3ad_bind_slave(struct slave *s
                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
@@@ -2470,10 -2470,6 +2470,10 @@@ int bond_3ad_lacpdu_recv(struct sk_buf
        if (!(dev->flags & IFF_MASTER))
                goto out;
  
 +      skb = skb_share_check(skb, GFP_ATOMIC);
 +      if (!skb)
 +              goto out;
 +
        if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
                goto out;
  

diff --combined net/core/dev.c
index 1e5077d,7c6a46f..24ea2d7
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -749,8 -749,7 +749,8 @@@ EXPORT_SYMBOL(dev_get_by_index)
   *    @ha: hardware address
   *
   *    Search for an interface by MAC address. Returns NULL if the device
 - *    is not found or a pointer to the device. The caller must hold RCU
 + *    is not found or a pointer to the device.
 + *    The caller must hold RCU or RTNL.
   *    The returned device has not had its ref count increased
   *    and the caller must therefore be careful about locking
   *
@@@ -6190,7 -6189,7 +6190,7 @@@ static void __net_exit default_device_e
  static void __net_exit default_device_exit_batch(struct list_head *net_list)
  {
        /* At exit all network devices most be removed from a network
-        * namespace.  Do this in the reverse order of registeration.
+        * namespace.  Do this in the reverse order of registration.
         * Do this across as many network namespaces as possible to
         * improve batching efficiency.
         */