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 /scripts | |
| parent | bgmac: propagate error codes in bgmac_probe() (diff) | |
| parent | r8152: ecm and vendor modes coexist (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 'scripts')
0 files changed, 0 insertions, 0 deletions