From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 17 Jan 2006 12:22:26 +0000 (-0500)
Subject: Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6
X-Git-Tag: v2.6.16-rc2~366^2~69
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-jgarzik' of git://git.tuxdriver.com/git/wireless-2.6
---

0f1c122ecfb046c8bac8d93cafc017d7b1aa21c9