From: David S. Miller Date: Fri, 27 Sep 2013 21:02:24 +0000 (-0400) Subject: Merge branch 'qlge' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0a325758a8183cd09bedb2dea7da666e20f74cb7;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'qlge' Jitendra Kalsaria says: ==================== This patch series enhance the handling of nested vlan tags in Rx path. V2 changes: * removed module parameter. V3 changes: * Users can enable or disable hardware VLAN acceleration using ethtool ==================== Signed-off-by: David S. Miller --- 0a325758a8183cd09bedb2dea7da666e20f74cb7