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

Documentation/DocBook/mac80211.tmpl

drivers/net/wireless/ath/Kconfig

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

drivers/net/wireless/b43/b43.h

drivers/net/wireless/b43/main.c

drivers/net/wireless/b43/pcmcia.c

drivers/net/wireless/b43legacy/b43legacy.h

drivers/net/wireless/b43legacy/main.c

drivers/net/wireless/iwmc3200wifi/Kconfig

drivers/net/wireless/mac80211_hwsim.c

drivers/net/wireless/p54/p54common.c

drivers/net/wireless/zd1211rw/zd_usb.c

drivers/platform/x86/hp-wmi.c

drivers/ssb/pcmcia.c

include/linux/rfkill.h

net/mac80211/mesh_hwmp.c

net/mac80211/rc80211_minstrel.c

net/wireless/nl80211.c

net/wireless/scan.c