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-01 18:37:45 -04:00
2016-06-14 10:29:44 +01:00
2016-08-04 13:59:56 +02:00
2016-08-04 20:26:31 -04:00
2016-08-01 18:36:01 -04:00