tree ec31336d5f6ee956e69074a9f3494c30bb053dfa
parent 43ecf5295b622e9ec93f5b932949acf1c6e4150c
parent 357efd57f229716fd6a1494b970c5a66c0c465ef
author Jeff Garzik <jeff@garzik.org> 1172882424 -0500
committer Jeff Garzik <jeff@garzik.org> 1172882424 -0500

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