summaryrefslogtreecommitdiff
path: root/curvetun_server.c
AgeCommit message (Collapse)AuthorFilesLines
2013-07-11curvetun_mgmt: consolidate the two mgmt include files into oneDaniel Borkmann1-1/+1
Consolidate the two mgmt include files into one. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
2013-07-11curvetun: renamed client, server, and management filesDaniel Borkmann1-0/+812
Rename those files so that they are conform to the rest of the files we have in our repository. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
'right'>2017-02-07 16:29:30 -0500 committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500 commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch) treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/nfc/nci parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc/nci')