]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 03b8654) | 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)
commit86d7a7295b3d1edf340015ac55a3cbbec4117929
tree6fe79f253081f247d19a73d368ebed7272cbf598tree | snapshot
parent03b86544da537cd94780c1015c5185363a99ec10commit | diff
e1000e: fixup merge error

When merging into Jeff's tree:

commit e860ce4f61426f4f056eac16ae95688059a0d870
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
Linux Kernel Source Tree.