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

Conflicts:
	net/nfc/llcp/llcp.c

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc net/nfc/llcp/llcp.c
index 3361170cb26224f75b35e06777e04d5dce3ca92f,b530afadd76c6168a5374d27935b7d95180f8884..bb67b98b979728e88624ea1bfb8349be190a183e
--- 1/net/nfc/llcp/llcp.c
--- 2/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@@ -156,9 -188,16 +188,19 @@@ static void local_cleanup(struct nfc_ll
        cancel_work_sync(&local->rx_work);
        cancel_work_sync(&local->timeout_work);
        kfree_skb(local->rx_pending);
 +      del_timer_sync(&local->sdreq_timer);
 +      cancel_work_sync(&local->sdreq_timeout_work);
 +      nfc_llcp_free_sdp_tlv_list(&local->pending_sdreqs);
+ }
+ 
+ static void local_release(struct kref *ref)
+ {
+       struct nfc_llcp_local *local;
+ 
+       local = container_of(ref, struct nfc_llcp_local, ref);
+ 
+       list_del(&local->list);
+       local_cleanup(local, false);
        kfree(local);
  }
  

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