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
..
2015-08-25 13:37:31 -07:00
2015-05-28 11:23:20 +08:00
2016-04-27 22:48:24 -04:00
2016-06-08 11:36:02 -07:00
2016-05-20 18:03:17 -04:00
2016-04-27 22:48:24 -04:00
2016-05-31 14:07:49 -07:00
2016-05-31 14:07:49 -07:00
2016-05-03 16:08:14 -04:00
2016-05-03 16:08:14 -04:00
2016-04-27 22:48:24 -04:00
2015-02-28 16:56:51 -05:00
2015-11-03 10:52:13 -05:00
2014-05-23 16:28:53 -04:00