tree a80578915557db98596821ff60d2ff37dafffb4f
parent 4cc5b44b29a9de9b3f841efedaa3f769066c63cc
parent 138e4ad67afd5c6c318b056b4d17c17f2c0ca5c0
author David S. Miller <davem@davemloft.net> 1504312925 -0700
committer David S. Miller <davem@davemloft.net> 1504312925 -0700

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

Three cases of simple overlapping changes.

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