Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:29:57 +0000 (00:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:29:57 +0000 (00:29 -0400)
commitdb21e578e551421d76641d72cb3f8296ed3f9e61
tree73968aeda7ed0051b5cff6950ad513011a3c7a5f
parent6ed14254cb6e269030ff09bed8673473b7be0283
parentdf8ccb9bf1ca360581a94c2245efb9fa613fbb29
Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream