tree 97633f920fa275a73f735b3eab0ad7728c44fdd1
parent 2a6f4e4983918b18fe5d3fb364afe33db7139870
parent 6ef89d0afabe472dd17caff85cec2f9cefeb5f06
author Jeff Garzik <jeff@garzik.org> 1193651280 -0400
committer Jeff Garzik <jeff@garzik.org> 1193651280 -0400

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