summaryrefslogtreecommitdiff
path: root/netsniff-ng/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to 'netsniff-ng/.gitignore')
0 files changed, 0 insertions, 0 deletions
cgit.cgi/linux/net-next.git/tree/net/sunrpc?id=e2160156bf2a7d5018e99a9993fbcdda0abac09b'>net/sunrpc parent62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)parent6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All merge conflicts were simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/clnt.c5
-rw-r--r--net/sunrpc/sunrpc_syms.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c