Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

This commit is contained in:
David S. Miller
2014-09-07 21:41:53 -07:00
694 changed files with 6362 additions and 3447 deletions

View File

@@ -3272,7 +3272,7 @@ static inline int __dev_uc_sync(struct net_device *dev,
}
/**
* __dev_uc_unsync - Remove synchonized addresses from device
* __dev_uc_unsync - Remove synchronized addresses from device
* @dev: device to sync
* @unsync: function to call if address should be removed
*
@@ -3316,7 +3316,7 @@ static inline int __dev_mc_sync(struct net_device *dev,
}
/**
* __dev_mc_unsync - Remove synchonized addresses from device
* __dev_mc_unsync - Remove synchronized addresses from device
* @dev: device to sync
* @unsync: function to call if address should be removed
*