]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit0c26692b7f47dc85a0a12a4b566401e3c443d920
tree3f1a03819a3effb74641ba8cd50c00002f5635f8
parent66050887d768af5152357fb0802627d5b3712709
parent314e541efc632a8d299d7362f49465e51539f9f5
Merge branch 'r8152'

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>