Merge branch 'master' of...

drivers/bcma/Kconfig

drivers/bcma/Makefile

drivers/bcma/bcma_private.h

drivers/bcma/driver_pci.c

drivers/bcma/host_pci.c

drivers/bcma/main.c

drivers/bcma/sprom.c

drivers/net/wireless/ath/ath.h

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

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

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

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

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

drivers/net/wireless/ath/ath9k/ath9k.h

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

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

drivers/net/wireless/ath/ath9k/debug.h

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

drivers/net/wireless/ath/ath9k/hw-ops.h

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