Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h

diff --cc drivers/net/wireless/ath/ath10k/debug.h
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/wmi.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/ath9k.h
Simple merge

diff --cc drivers/net/wireless/atmel.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index c9b06b4e71f7d5be0f88400d9da26e15cb39e9f9,1b034ea46f932ff4c8aea837b88603861b2e44c0..fc0d4f0129db269dd7d7139c286fa90063c3bab3
--- 1/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
--- 2/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@@ -206,17 -210,22 +210,17 @@@ int brcmf_sdio_regrw_helper(struct brcm
   * Returns 0 or error code.
   * NOTE: Async operation is not currently supported.
   */
 -extern int
 -brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, struct sk_buff_head *pktq);
 -extern int
 -brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, u8 *buf, uint nbytes);
 -
 -extern int
 -brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, struct sk_buff *pkt);
 -extern int
 -brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                    uint flags, u8 *buf, uint nbytes);
 -extern int
 -brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -                      uint flags, struct sk_buff_head *pktq, uint totlen);
 +int brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, struct sk_buff_head *pktq);
 +int brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, u8 *buf, uint nbytes);
 +
 +int brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, struct sk_buff *pkt);
 +int brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +                        uint flags, u8 *buf, uint nbytes);
 +int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
-                           uint flags, struct sk_buff_head *pktq);
++                          uint flags, struct sk_buff_head *pktq, uint totlen);
  
  /* Flags bits */
  

diff --cc drivers/net/wireless/iwlwifi/mvm/rs.h
Simple merge

diff --cc include/net/bluetooth/bluetooth.h
Simple merge

diff --cc include/net/bluetooth/hci_core.h
Simple merge

diff --cc include/net/bluetooth/rfcomm.h
Simple merge