summaryrefslogtreecommitdiff
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-11-20 13:08:14 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-11-20 13:08:14 -0500
commit400e020892a9a20eea5d2c9bce8bfb312075c4ba (patch)
treeab0fd2f2f58146a2c26d1ee415917b006577bdd0 /net/bluetooth
parent65210946f31007d12efcf66586fdcaf6ff3fa8f9 (diff)
parent5b412fd11c918171c98a253d8a3484afa9f69ca5 (diff)
Merge tag 'nfc-fixes-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0
Samuel says: "This is the first pull request for 3.7 NFC fixes. We mostly have pn533 fixes here, 2 memory leaks and an early unlocking fix. Moreover, we also have an LLCP adapter linked list insertion fix." Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/bluetooth')
0 files changed, 0 insertions, 0 deletions