David S. Miller 6bb8824732 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... net/ipv6/ip6_gre.c is a case of parallel adds. include/trace/events/tcp.h is a little bit more tricky. The removal of in-trace-macro ifdefs in 'net' paralleled with moving show_tcp_state_name and friends over to include/trace/events/sock.h in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-12-29 15:42:26 -05:00
..
mlx4	net/mlx4_en: Change default QoS settings	2017-12-28 12:24:05 -05:00
mlx5/core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-29 15:42:26 -05:00
mlxfw	net/mlxfw: Properly handle dependancy with non-loadable mlx5	2017-07-03 02:32:25 -07:00
mlxsw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-12-22 11:16:31 -05:00
Kconfig	Change Kconfig description	2017-08-14 11:18:16 -07:00
Makefile	Add the mlxfw module for Mellanox firmware flash process	2017-05-25 17:46:17 -04:00