From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 8 Jun 2006 19:56:17 +0000 (-0400)
Subject: Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into tmp
X-Git-Tag: v2.6.18-rc1~1115^2~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cac925a4aab1b7233d3beb591f53498816058a08;p=linux-2.6

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

cac925a4aab1b7233d3beb591f53498816058a08