tree fd40f2f794431089c18659ecfaa054cad5dca22e
parent 9f737633e6ee54fc174282d49b2559bd2208391d
parent 782a6675119c76c071e74e2ddd98268f47770cba
author Jeff Garzik <jeff@garzik.org> 1155095328 -0400
committer Jeff Garzik <jeff@garzik.org> 1155095328 -0400

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