summaryrefslogtreecommitdiff
path: root/net/nfc/llcp_sock.c
AgeCommit message (Expand)Author
2013-04-30Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller
2013-04-29Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville
2013-04-26NFC: Move LLCP code to the NFC top level diirectorySamuel Ortiz