Merge branch 'master' of ../linux-2.6/

diff --combined net/core/dev.c
index 95161054c4d1d27080b367ababeccce5d100bf1d,908f07c3bd7dcec4b543c27382b57ad2df9d8993..fcdf03cf3b3f8b0f62af03ce208b658d11a5834d
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2143,7 -2143,7 +2143,7 @@@ static int process_backlog(struct napi_
   *
   * The entry's receive function will be scheduled to run
   */
- void fastcall __napi_schedule(struct napi_struct *n)
+ void __napi_schedule(struct napi_struct *n)
  {
        unsigned long flags;
  
@@@ -2900,7 -2900,7 +2900,7 @@@ int __dev_addr_add(struct dev_addr_lis
                }
        }
  
 -      da = kmalloc(sizeof(*da), GFP_ATOMIC);
 +      da = kzalloc(sizeof(*da), GFP_ATOMIC);
        if (da == NULL)
                return -ENOMEM;
        memcpy(da->da_addr, addr, alen);
@@@ -3038,8 -3038,7 +3038,7 @@@ int dev_unicast_sync(struct net_device 
  EXPORT_SYMBOL(dev_unicast_sync);
  
  /**
-  *    dev_unicast_unsync - Remove synchronized addresses from the destination
-  *                         device
+  *    dev_unicast_unsync - Remove synchronized addresses from the destination device
   *    @to: destination device
   *    @from: source device
   *