David S. Miller 1578b0a5e9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/sched/act_police.c net/sched/sch_drr.c net/sched/sch_hfsc.c net/sched/sch_prio.c net/sched/sch_red.c net/sched/sch_tbf.c In net-next the drop methods of the packet schedulers got removed, so the bug fixes to them in 'net' are irrelevant. A packet action unload crash fix conflicts with the addition of the new firstuse timestamp. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-06-10 11:52:24 -07:00
..
mlx4	net/mlx4_en: fix ethtool -x	2016-06-09 23:39:46 -07:00
mlx5/core	net/mlx5e: Fix blue flame quota logic	2016-06-09 22:06:27 -07:00
mlxsw	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-10 11:52:24 -07: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