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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
	drivers/net/wireless/rtlwifi/pci.c
Merge commit 'c48b1f729a75880d0895f0b23efaf551ee800a35' into m0-broken

Conflicts:
	drivers/net/wireless/rtlwifi/pci.c