Merge branch 'r8169-net'
authorDavid S. Miller <davem@davemloft.net>
Sat, 13 Sep 2014 20:52:52 +0000 (16:52 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Sep 2014 20:52:52 +0000 (16:52 -0400)
Hayes Wang says:

====================
r8169: fix rx vlan

There are two issues for hw rx vlan. The patches are
used to fix them.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge