]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2b1c435) | patch
e1000e: fixup merge error
authorArthur Jones <ajones@riverbed.com>
Fri, 20 Mar 2009 22:56:35 +0000 (15:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Mar 2009 22:56:35 +0000 (15:56 -0700)
commit3f518390ab1b65bc2e2bc01774eb2c5918c433ee
tree6fe79f253081f247d19a73d368ebed7272cbf598tree | snapshot
parent2b1c4354de72ced917d2f3fe88117613f992234bcommit | 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>
drivers/net/e1000e/netdev.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.