diff options
| author | John W. Linville <[email protected]> | 2013-04-01 19:14:22 +0000 |
|---|---|---|
| committer | John W. Linville <[email protected]> | 2013-04-01 19:14:22 +0000 |
| commit | b0bb9b392d17a2ca71651706b5acd6d4fc199cb6 (patch) | |
| tree | d27dc0699b5f3c2cdaf2102fe2ddd7f2e9e77c00 /net/unix/af_unix.c | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
| parent | NFC: microread: Fix build failure due to a new MEI bus API (diff) | |
| download | kernel-b0bb9b392d17a2ca71651706b5acd6d4fc199cb6.tar.gz kernel-b0bb9b392d17a2ca71651706b5acd6d4fc199cb6.zip | |
Merge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes
Samuel Ortiz <[email protected]> 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 <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions