David S. Miller 60747ef4d1 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>
2016-08-18 01:17:32 -04:00
..
2016-08-05 09:48:22 -04:00
2016-08-05 09:48:22 -04:00
2016-08-05 09:48:22 -04:00
2016-08-05 09:48:22 -04:00
2016-08-12 16:23:58 -07:00