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
2016-03-28 17:57:45 +02:00
2016-06-06 09:47:25 +09:00
2016-05-15 13:32:48 -04:00
2016-04-12 23:01:57 +02:00
2016-05-06 11:50:01 +02:00
2016-05-30 12:21:22 +02:00
2016-06-01 17:54:19 -07:00
2016-05-30 12:21:22 +02:00
2016-04-18 20:39:48 +02:00
2016-05-06 11:50:01 +02:00
2016-04-23 20:13:24 -04:00
2016-04-19 20:26:25 +02:00
2016-04-24 00:12:08 -04:00
2016-05-05 16:39:50 +02:00
2016-05-05 16:39:50 +02:00
2016-05-30 12:21:22 +02:00
2016-05-30 12:21:22 +02:00
2016-06-01 17:54:19 -07:00
2016-05-30 12:21:22 +02:00
2016-03-01 17:36:47 -05:00
2016-05-09 16:45:49 +02:00
2016-05-25 11:54:22 +02:00
2016-06-01 17:54:19 -07:00
2016-04-23 20:13:24 -04:00
2016-05-15 13:32:48 -04:00
2016-05-05 16:39:47 +02:00
2016-06-01 17:54:19 -07:00
2016-03-11 11:37:56 +01:00
2016-04-23 20:13:24 -04:00
2016-05-05 16:27:59 +02:00
2016-04-23 20:13:24 -04:00
2016-04-05 10:56:32 +02:00
2016-04-23 20:13:24 -04:00
2016-03-02 20:05:27 +01:00
2016-02-29 13:55:59 +01:00
2016-04-25 15:32:41 +02:00
2016-06-02 14:09:33 +02:00
2016-04-18 20:39:48 +02:00
2016-04-29 14:28:48 +02:00
2016-02-29 13:59:43 +01:00
2016-06-07 16:37:14 -07:00
2016-04-04 22:11:20 -04:00
1578b0a5e9