tree 0b241c17a89330382527e667f96b64cc22397cfc
parent 6651a5c3839517685c601e44979f19de8b6249c3
parent 4a99ac3a9ee7e1b90ebc3ddbb44db75eef5c41e6
author Jeff Garzik <jgarzik@pobox.com> 1138482390 -0500
committer Jeff Garzik <jgarzik@pobox.com> 1138482390 -0500

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