diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 18:49:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 18:49:06 -0800 |
| commit | 85a5bac9cd90966be75707e5b599bdd2cdcaa0e0 (patch) | |
| tree | 3f1a03819a3effb74641ba8cd50c00002f5635f8 /net/netlabel | |
| parent | 5571415c9685acc2c768b33d0be40b3f46869f14 (diff) | |
| parent | c7de7dec2ff2528ec630c55e68c25bd9d972b677 (diff) | |
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>
Diffstat (limited to 'net/netlabel')
0 files changed, 0 insertions, 0 deletions