From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 5 Jul 2006 18:32:39 +0000 (-0400)
Subject: Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into... 
X-Git-Tag: v2.6.18-rc2~255^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0bc8721b8d0380ec69fa97578c91201201b05a9;p=pandora-kernel.git

Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream

Conflicts:

	drivers/net/e1000/e1000_main.c
---

c0bc8721b8d0380ec69fa97578c91201201b05a9
Reading git-diff-tree failed