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>
2 files changed, 6 insertions, 0 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
parent	62e13097c46c69dbd7544ab2cd585ccf48f360a4 (diff)
parent	6d04dfc8966019b8b0977b2cb942351f13d2b178 (diff)