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-17 19:36:23 -04:00
2015-08-25 13:37:31 -07:00
2015-05-28 11:23:20 +08:00
2016-06-08 11:36:02 -07:00
2016-07-05 14:09:23 -07:00
2016-05-20 18:03:17 -04:00
2016-05-31 14:07:49 -07:00
2016-06-15 20:41:23 -07:00
2016-04-27 22:48:24 -04:00
2016-06-27 15:06:17 -04:00
2015-02-28 16:56:51 -05:00
2015-11-03 10:52:13 -05:00
2014-05-23 16:28:53 -04:00