Merge branch 'master' of...

Documentation/devicetree/bindings/net/nfc/trf7970a.txt

MAINTAINERS

drivers/bluetooth/ath3k.c

drivers/bluetooth/bfusb.c

drivers/bluetooth/bluecard_cs.c

drivers/bluetooth/bt3c_cs.c

drivers/bluetooth/btuart_cs.c

drivers/bluetooth/btusb.c

drivers/bluetooth/dtl1_cs.c

drivers/bluetooth/hci_bcsp.c

drivers/bluetooth/hci_h5.c

drivers/bluetooth/hci_ldisc.c

drivers/net/wireless/Kconfig

drivers/net/wireless/Makefile

drivers/net/wireless/ath/ath.h

drivers/net/wireless/ath/ath10k/ce.c

drivers/net/wireless/ath/ath10k/ce.h

drivers/net/wireless/ath/ath10k/core.h

drivers/net/wireless/ath/ath10k/hif.h

drivers/net/wireless/ath/ath10k/htc.c