tree 313d1d2e7cc1d26ce8ef29087c91f12d1ed4d0ff
parent 816fd404718fc6064ddb05e6b310b2bc2ae7a187
parent 4832843d773462643cc471ca715382f5e509afb3
author Jeff Garzik <jeff@garzik.org> 1141167870 -0500
committer Jeff Garzik <jeff@garzik.org> 1141167870 -0500

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