From: David S. Miller <davem@davemloft.net>
Date: Sat, 13 Sep 2014 20:52:52 +0000 (-0400)
Subject: Merge branch 'r8169-net'
X-Git-Tag: v3.17-rc7~31^2~32
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=638898f11ace889ba6b3f425f76b1ed1d316b99d;p=linux.git

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>
---

638898f11ace889ba6b3f425f76b1ed1d316b99d