ad8fbb9e864c61a8924c9
parent c2805fbb8630abb95d94ce7adc3f97976f7e0367
author Jeff Garzik <jeff@garzik.org> 1175062878 -0400
committer Jeff Garzik <jeff@garzik.org> 1175062878 -0400

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