Revert "Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6"

This reverts commit 7c492664895abaad1e61b1d4a8d76123b15f6ca6.
Revert "Revert "Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6""

This reverts commit d8d49800e2a6a32424e6efaf225b811a8bffae65.
Revert "Revert "Revert "Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6"""

This reverts commit adf311af8b8417f053acb75b526aa8b99695bf90.