tree d0d99f78b46051cabd1e75ce5269b6d1a40f7a12
parent b0b020d4783fbc4cc477e2ca678ac47c50d5bc3e
parent ae7ec20582de0867abda66ad06d468ce12b231f2
author Jeff Garzik <jgarzik@pobox.com> 1138726211 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1138726211 -0500

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