From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 24 Aug 2005 05:03:34 +0000 (-0400)
Subject: Merge upstream into 'upstream' branch of netdev-2.6.git.
X-Git-Tag: v2.6.14-rc1~1055^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75a95178dafb5c8d69b4abe45ea746a9cea23142;p=pandora-kernel.git

Merge upstream into 'upstream' branch of netdev-2.6.git.

Hand fix merge conflict in drivers/net/tokenring/Kconfig.
---

75a95178dafb5c8d69b4abe45ea746a9cea23142
Reading git-diff-tree failed