tree 38ce19eb451b969389e456aa4d9bb7321626f481
parent 1def630a6a49dda5bc89dfbd86656293640456f0
parent ea9a7719597e81a119a155178eabfc941eef11cc
author Jeff Garzik <jeff@garzik.org> 1149795987 -0400
committer Jeff Garzik <jeff@garzik.org> 1149795987 -0400

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