From: Arthur Jones <ajones@riverbed.com>
Date: Fri, 20 Mar 2009 22:56:35 +0000 (-0700)
Subject: e1000e: fixup merge error
X-Git-Tag: v2.6.30-rc1~662^2~173
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f518390ab1b65bc2e2bc01774eb2c5918c433ee;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed