From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 8 Jun 2006 19:48:25 +0000 (-0400)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683;p=linux.git

Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream
---

ba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683