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