diff options
author | David S. Miller <davem@davemloft.net> | 2014-03-03 02:04:05 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-03 02:04:05 +0100 |
commit | a811f2c0386afdee71bbf2bf857e75fb9dc088f7 (patch) | |
tree | c4d7df1339aa994d2572cf0165f925c33b4ed11b /drivers/connector/connector.c | |
parent | Merge branch '6lowpan' (diff) | |
parent | net/mlx4_en: Change Connect-X description in kconfig (diff) | |
download | linux-a811f2c0386afdee71bbf2bf857e75fb9dc088f7.tar.xz linux-a811f2c0386afdee71bbf2bf857e75fb9dc088f7.zip |
Merge branch 'mlx4'
Amir Vadai says:
====================
net/mlx4: Mellanox driver update 27-02-2014
This patchset contains some fixes for small trivial bugs, and
compilation/syntactic parsers warnings
Patchset was applied and tested over commit 750f679 "Merge branch '6lowpan'"
Changes from V1:
-patch 5/9: Replace mlx4_en_mac_to_u64() with mlx4_mac_to_u64()
- Remove unnecessary define of ETH_ALEN
Changes from V0:
-patch 3/9: net/mlx4_en: Pad ethernet packets smaller than 17 bytes
- Make condition more efficient
- Didn't use canonical function to pad buffer since using bounce buffer
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/connector/connector.c')
0 files changed, 0 insertions, 0 deletions