Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
authorJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:48:48 +0000 (23:48 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 9 Aug 2006 03:48:48 +0000 (23:48 -0400)
commit2f96740c26f1dcff9111dca3e01379ab12aafde5
treefd40f2f794431089c18659ecfaa054cad5dca22e
parent9f737633e6ee54fc174282d49b2559bd2208391d
parent782a6675119c76c071e74e2ddd98268f47770cba
Merge branch 'upstream-fixes' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream-fixes