From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 6 Dec 2012 19:55:57 +0000 (-0500)
Subject: Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~45^2~56^2^2~35
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55cb0797fa779e36f62876a8aa44cbf3984e8d59;p=pandora-kernel.git

Merge tag 'nfc-fixes-3.7-2' of git://git./linux/kernel/git/sameo/nfc-3.0

This is an NFC LLCP fix for 3.7 and contains only one patch.

It fixes a potential crash when receiving an LLCP HDLC frame acking a frame
that is not the last sent one. In that case we may dereference an already
freed pointer.
---

55cb0797fa779e36f62876a8aa44cbf3984e8d59
Reading git-diff-tree failed