]> Pileus Git - ~andy/linux/commitdiff
projects / ~andy / linux / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5571415 c7de7de)
Merge branch 'r8152'
authorDavid S. Miller <davem@davemloft.net>
Wed, 15 Jan 2014 02:49:06 +0000 (18:49 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Jan 2014 02:49:06 +0000 (18:49 -0800)
Hayes Wang says:

====================
r8152: remove limitation

Remove the limitation between ecm mode and vendor mode.

v2: replace the patch #3 with "ecm and vendor modes coexist".
====================

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

Trivial merge
Andy's Linux Kernel repo