tree 14e5a1b941d6e4cf7b2c9c1ed46262f427a825a9
parent aed2cec45c426c941c80d84ec89ce34f2f2607cc
parent 0c234ae655a45ac3ee53a25b2e56e9bb6c27d71d
author Jeff Garzik <jeff@garzik.org> 1167169111 -0500
committer Jeff Garzik <jeff@garzik.org> 1167169111 -0500

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