From: Auke Kok <auke-jan.h.kok@intel.com>
Date: Wed, 21 Jun 2006 20:43:50 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.18-rc2~255^2~1^2~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0d204094d15dac2e8a439b993f71eda385b4dccd;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
---

0d204094d15dac2e8a439b993f71eda385b4dccd