]> git.karo-electronics.de Git - linux-beck.git/commit
Merge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Apr 2013 19:14:22 +0000 (15:14 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 1 Apr 2013 19:14:22 +0000 (15:14 -0400)
commitb0bb9b392d17a2ca71651706b5acd6d4fc199cb6
treed27dc0699b5f3c2cdaf2102fe2ddd7f2e9e77c00
parent2206c3ab2bc45abe6b4472c37d6bdfa2fbcf9d67
parent9593b0b1179c526436f14849a9587fd2aae12040
Merge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes

Samuel Ortiz <sameo@linux.intel.com> says:

"This is the 2nd batch of NFC fixes for 3.9. This time we have:

- A crash fix for when a DGRAM LLCP socket is listening while the NFC adapter
  is physically removed.
- A potential double skb free when the LLCP socket receive queue is full.
- A fix for properly handling multiple and consecutive LLCP connections, and
  not trash the socket ack log.
- A build failure for the MEI microread physical layer, now that the MEI bus
  APIs have been merged into char-misc-next."

Signed-off-by: John W. Linville <linville@tuxdriver.com>