From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 24 Aug 2005 05:02:04 +0000 (-0400)
Subject: Merge upstream into ieee80211.
X-Git-Tag: v2.6.14-rc1~1017^2~8^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2382b363df828f25e35ed8b70a3da33b29b2a64;p=pandora-kernel.git

Merge upstream into ieee80211.

Hand-fix merge conflict in drivers/usb/net/zd1201.c.
---

b2382b363df828f25e35ed8b70a3da33b29b2a64
Reading git-diff-tree failed