From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 18 Mar 2013 13:39:21 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~65^2~390^2^2~30
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=49c87cd1eac1f798c5bad7f7eb809e6df36b6c56

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

Conflicts:
	net/nfc/llcp/llcp.c
---

49c87cd1eac1f798c5bad7f7eb809e6df36b6c56
diff --cc net/nfc/llcp/llcp.c
index 3361170cb262,b530afadd76c..bb67b98b9797
--- a/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);
  }