summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-09-28 10:55:00 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-09-28 10:55:43 -0400
commit97ea6d0f3eb019891038cd2dfddb749d6bf219be (patch)
tree3b7d2f31ab27b4cd5546b0ab72bb9a0c3bdfd008 /include/net
parent8a14e8bf386434732eed6678120fe52acee6244a (diff)
parent50b78b2a6500d0e97c204c1b6c51df8c17358bbe (diff)
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 <sameo@linux.intel.com>: 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 <linville@tuxdriver.com>
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions