tree 83f20d0d3c12d9db75fdfc74454d781d2e4ea590
parent 6aab44475a1355365f0a24abe6f8eb32185a701e
parent b312362be6d9155b66f3a26d9159e0a680fbd6c5
author Jeff Garzik <jeff@garzik.org> 1171988922 -0500
committer Jeff Garzik <jeff@garzik.org> 1171988922 -0500

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