Merge branch 'qlge'
authorDavid S. Miller <davem@davemloft.net>
Fri, 27 Sep 2013 21:02:24 +0000 (17:02 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Sep 2013 21:02:24 +0000 (17:02 -0400)
commit0a325758a8183cd09bedb2dea7da666e20f74cb7
treed996119efa5b9422f93ebd3963eb8b0cc89a23dd
parentfac87a8ecd02a99474d817b6784b6722736f9f0f
parent146669a5ab99285e95e2a7d04d8754534b585dd4
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 <davem@davemloft.net>