David S. Miller e800072c18 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-09 15:59:24 -04:00
..
2014-10-09 11:35:48 +03:00
2015-07-27 14:06:24 +02:00
2015-11-23 09:44:58 +01:00
2016-03-17 15:09:34 -07:00
2016-02-29 09:35:20 +01:00
2016-02-07 23:17:59 -08:00
2016-03-02 17:01:55 +02:00
2014-04-30 19:49:37 +01:00
2014-08-06 18:01:25 -07:00
2014-05-05 09:09:14 +02:00
2016-01-19 15:26:55 -05:00
2014-08-08 15:57:25 -07:00
2016-03-09 15:43:42 -08:00
2015-02-12 18:54:15 -08:00
2014-06-25 17:45:43 -07:00
2016-04-23 20:13:24 -04:00
2015-09-08 14:35:59 -07:00
2015-02-12 18:54:16 -08:00
2016-03-17 15:09:34 -07:00
2015-03-23 22:12:08 -04:00
2015-06-25 17:00:40 -07:00
2016-03-17 15:09:34 -07:00
2013-04-29 18:28:42 -07:00