From: John W. Linville Date: Fri, 28 Sep 2012 14:55:00 +0000 (-0400) Subject: Merge tag 'nfc-next-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0 X-Git-Tag: v3.7-rc1~145^2~31^2^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=97ea6d0f3eb019891038cd2dfddb749d6bf219be;p=linux.git Merge tag 'nfc-next-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0 So says Samuel Ortiz : The 2nd NFC pull request for 3.7. - A couple of wrong context sleep fixes. - An LLCP rwlock intizialisation fix. - A missing mutex unlocking for pn533. - LLCP raw sockets support. This is going to be used for NFC sniffing. - A build fix for llc_shdlc. It fixes a build error triggered by code that's living in wireless-next. Signed-off-by: John W. Linville --- 97ea6d0f3eb019891038cd2dfddb749d6bf219be