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-06-28 05:26:14 -04:00
2016-07-05 14:08:47 -07:00
2016-08-17 19:36:23 -04:00
2016-05-29 22:33:25 -07:00
2016-08-12 12:32:24 -07:00
2016-07-26 16:19:19 -07:00
2016-06-09 23:41:03 -07:00
2016-08-17 19:36:23 -04:00
2016-08-17 19:36:23 -04:00