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

diff --cc drivers/net/wireless/ath/wil6210/txrx.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/tx.c
Simple merge

diff --cc net/bluetooth/sco.c
index 2c80553505107540f75c1d4521f8a61e900b61cd,9e62102443dc79a408feed50d9db48576422fd5c..373d81e6e8f0af0a6cc33bbdf0d7c6e905726db5
--- 1/net/bluetooth/sco.c
--- 2/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@@ -663,9 -698,8 +698,9 @@@ static int sco_sock_recvmsg(struct kioc
  
        if (sk->sk_state == BT_CONNECT2 &&
            test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {
-               hci_conn_accept(pi->conn->hcon, 0);
+               sco_conn_defer_accept(pi->conn->hcon, 0);
                sk->sk_state = BT_CONFIG;
 +              msg->msg_namelen = 0;
  
                release_sock(sk);
                return 0;

diff --cc net/mac80211/tx.c
Simple merge

diff --cc net/nfc/llcp/sock.c
Simple merge

diff --cc net/wireless/util.c
Simple merge