git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b1c435)
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)
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 patch | blob | history

diff --cc drivers/net/e1000e/netdev.c
Simple merge
Pandora Kernel Repository