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
..
2015-12-04 22:46:25 +01:00
2016-03-22 15:36:02 -07:00
2015-04-11 22:27:55 -04:00
2015-11-19 17:51:48 +01:00
2016-01-22 18:04:28 -05:00
2016-02-08 11:25:39 -05:00
2014-08-08 15:57:18 -07:00
2015-12-14 14:54:37 -05:00
2015-04-12 21:03:31 +02:00
2016-03-22 15:36:02 -07:00
2015-11-23 09:44:58 +01:00
2016-04-28 19:34:04 -07:00
2016-03-22 15:36:02 -07:00
2016-03-22 15:36:02 -07:00
2016-02-16 13:04:58 -05:00
2015-01-17 10:02:23 +13:00
2016-01-22 18:04:28 -05:00
2016-03-01 20:36:56 +01:00