From: David S. Miller Date: Mon, 3 Mar 2014 01:04:05 +0000 (-0500) Subject: Merge branch 'mlx4' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a811f2c0386afdee71bbf2bf857e75fb9dc088f7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- a811f2c0386afdee71bbf2bf857e75fb9dc088f7