Merge branch 'master' of...

Documentation/nfc/nfc-hci.txt

Documentation/nfc/nfc-pn544.txt

arch/mips/bcm47xx/serial.c

drivers/bcma/bcma_private.h

drivers/bcma/driver_chipcommon.c

drivers/bcma/driver_mips.c

drivers/bcma/driver_pci_host.c

drivers/bcma/main.c

drivers/bluetooth/ath3k.c

drivers/bluetooth/btusb.c

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

drivers/net/wireless/ath/ath6kl/cfg80211.c

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

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

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

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

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

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

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

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