tree d45c11bba3458a805c4ac766ac85ebcf3c00b1eb
parent faeeb317a5615076dff1ff44b51e862e6064dbd0
parent ea6b1720ce25f92f7a17b2e0c2b653d20773d10a
author David S. Miller <davem@davemloft.net> 1491488707 -0700
committer David S. Miller <davem@davemloft.net> 1491492291 -0700

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

Mostly simple cases of overlapping changes (adding code nearby,
a function whose name changes, for example).

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