tree ea0faf33b952495c47909be1400c475a3f3821b0
parent 484334198f8ce9552e20930fff9408ebf6bcf94d
parent 184ca823481c99dadd7d946e5afd4bb921eab30d
author David S. Miller <davem@davemloft.net> 1471497452 -0400
committer David S. Miller <davem@davemloft.net> 1471497452 -0400

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

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

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