summaryrefslogtreecommitdiffstats
path: root/net/nfc/llcp_sock.c
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-04-291-1/+5
* NFC: Move LLCP code to the NFC top level diirectorySamuel Ortiz2013-04-261-0/+1025