tree 363c2bc1f8b5185b37f05106fec4ba2a07134182
parent 68727fed5469100bec0764207d7efb7a9ecdee29
parent 07981aa43f6aec32b875f360755ed3d14f9d5139
author Jeff Garzik <jeff@garzik.org> 1141196355 -0500
committer Jeff Garzik <jeff@garzik.org> 1141196355 -0500

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