David S. Miller b3e0d3d7ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/geneve.c Here we had an overlapping change, where in 'net' the extraneous stats bump was being removed whilst in 'net-next' the final argument to udp_tunnel6_xmit_skb() was being changed. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-17 22:08:28 -05:00
..
mlx4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-12-17 22:08:28 -05:00
mlx5/core	net/mlx5e: Rename en_flow_table.c to en_fs.c	2015-12-12 00:15:24 -05:00
mlxsw	mlxsw: spectrum: Add support for VLAN devices on top of LAG	2015-12-15 11:58:24 -05:00
Kconfig	mlxsw: Introduce Mellanox switch driver core	2015-07-30 00:04:59 -07:00
Makefile	mlxsw: Introduce Mellanox switch driver core	2015-07-30 00:04:59 -07:00