tree 2d882d7b9b8a9b4efdef8cb782fd8c13c8df5620
parent fd60ae404f104f12369e654af9cf03b1f1047661
parent fde627b54ce7bef094157074f3adb9b6e1a96d4c
author Jeff Garzik <jeff@garzik.org> 1154639984 -0400
committer Jeff Garzik <jeff@garzik.org> 1154639984 -0400

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