| commit | 3f518390ab1b65bc2e2bc01774eb2c5918c433ee | [log] [tgz] |
|---|---|---|
| author | Arthur Jones <ajones@riverbed.com> | Fri Mar 20 15:56:35 2009 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri Mar 20 15:56:35 2009 -0700 |
| tree | 6fe79f253081f247d19a73d368ebed7272cbf598 | |
| parent | 2b1c4354de72ced917d2f3fe88117613f992234b [diff] |
e1000e: fixup merge error When merging into Jeff's tree: commit 5f66f208064f083aab5e55935d0575892e033b59 Author: Arthur Jones <ajones@riverbed.com> Date: Thu Mar 19 01:13:08 2009 +0000 e1000e: allow tx of pre-formatted vlan tagged packets We lost one line, this fixes that missing piece... Signed-off-by: Arthur Jones <ajones@riverbed.com> Signed-off-by: David S. Miller <davem@davemloft.net>