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

drivers/net/wireless/ath/ath5k/base.c

drivers/net/wireless/ath/ath9k/ani.c

drivers/net/wireless/ath/regd.c

drivers/net/wireless/iwlwifi/iwl-agn.c

drivers/net/wireless/iwlwifi/iwl-tx.c

drivers/net/wireless/iwlwifi/iwl3945-base.c

drivers/net/wireless/iwmc3200wifi/netdev.c

drivers/net/wireless/libertas/cmd.c

drivers/net/wireless/libertas/defs.h

drivers/net/wireless/mac80211_hwsim.c

drivers/net/wireless/p54/p54spi.c

drivers/net/wireless/rt2x00/rt2500usb.c

drivers/net/wireless/rtl818x/rtl8187_leds.c

drivers/platform/x86/acer-wmi.c

include/linux/rfkill.h

net/mac80211/Kconfig

net/mac80211/mesh_pathtbl.c

net/mac80211/tx.c

net/rfkill/core.c

net/wireless/nl80211.c