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-05-20 17:58:30 -07:00
2016-08-07 10:03:31 -04:00
2016-08-12 12:32:24 -07:00
2016-07-29 12:05:25 +02:00
2016-08-07 10:03:31 -04:00
2016-05-23 17:04:14 -07:00
2016-07-27 09:53:35 -07:00
2016-06-07 22:07:09 -04:00
2016-07-28 17:38:16 -07:00
2016-08-07 10:13:14 -04:00
2016-06-21 09:38:45 +10:00
2016-08-04 19:59:06 -04:00
2016-06-20 17:11:29 -04:00
2016-07-01 10:24:18 -04:00
2016-06-21 09:23:11 +10:00
2016-08-07 10:03:31 -04:00
2016-08-07 10:13:14 -04:00
2016-07-26 16:19:19 -07:00
2016-08-07 10:03:31 -04:00