From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 30 Jun 2005 04:49:18 +0000 (-0400)
Subject: Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
X-Git-Tag: v2.6.14-rc1~1017^2~41^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0c168775709faa74c1b87f1e61046e0c51ade7f3;p=linux.git

Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
---

0c168775709faa74c1b87f1e61046e0c51ade7f3