tree 55a096677bbb6a6d1840bb44769193c0e9eefa84
parent 9914cad54c79d0b89b1f066c0894f00e1344131c
parent 412e9e7800360ec93b6ba319b30666f6bfc721bd
author Jeff Garzik <jeff@garzik.org> 1198383916 -0500
committer Jeff Garzik <jeff@garzik.org> 1198383916 -0500

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