tree 28fdc4035af01d19c4f976d020ce98f251298182
parent cfadbd298e8b3e7f2e324696b653bb74094590db
parent 41072a1be57f63bf83afc31c44d72de018d800fa
author Jeff Garzik <jeff@garzik.org> 1161454871 -0400
committer Jeff Garzik <jeff@garzik.org> 1161454871 -0400

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