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)
commit638898f11ace889ba6b3f425f76b1ed1d316b99d
treea8bacd7ce6db5aca8dbd25185ca97df92d17ffb8
parent618073e30c225ddaef086c030a5f0a3c7ef2d323
parent36d8e82541c4be8f529dce9efbcefd504e085ccf
Merge branch 'r8169-net'

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>