tree 3eceef36f96a6cf187cf8c4072fd83b4f6435315
parent cc3afe6f856054a3752ef2b3ccc5eebf33bd5024
parent a67ab2bde752b26be75d4b68ecead9a14692eac5
author Jeff Garzik <jeff@garzik.org> 1159229354 -0400
committer Jeff Garzik <jeff@garzik.org> 1159229354 -0400

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