tree 6f3ed3a4f4af9e74436ec9355ebf8201357f1c40
parent 0b498a52778368ff501557d68c7b50878ab1701e
parent e4e98c460ad38c78498622a164fd5ef09a2dc9cb
author David S. Miller <davem@davemloft.net> 1472532842 -0400
committer David S. Miller <davem@davemloft.net> 1472532842 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All three conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>