tree 69fe6d3bcdbf0acb76e42b144d8af5a0234ccdcb
parent eb2ca35f1814dad3ca547261eedfbbd0d65a0efc
parent e76d21c40bd6c67fd4e2c1540d77e113df962b4d
author David S. Miller <davem@davemloft.net> 1479225276 -0500
committer David S. Miller <davem@davemloft.net> 1479225276 -0500

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

Several cases of bug fixes in 'net' overlapping other changes in
'net-next-.

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