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