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