summaryrefslogtreecommitdiffstats
path: root/net/nfc/llcp_sock.c
AgeCommit message (Expand)AuthorFilesLines
2013-04-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller1-2/+3
2013-04-29Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville1-0/+1029
2013-04-26NFC: Move LLCP code to the NFC top level diirectorySamuel Ortiz1-0/+1025