Files
android_kernel_samsung_sm8750/include/uapi/linux
David S. Miller 6b6cbc1471 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were simply overlapping changes.  In the net/ipv4/route.c
case the code had simply moved around a little bit and the same fix
was made in both 'net' and 'net-next'.

In the net/sched/sch_generic.c case a fix in 'net' happened at
the same time that a new argument was added to qdisc_hash_add().

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-04-15 21:16:30 -04:00
..
2017-01-05 13:02:25 +00:00
2016-11-29 09:00:30 +01:00
2016-10-18 10:05:42 -06:00
2017-04-09 18:26:08 -07:00
2016-01-20 17:09:18 -08:00
2016-10-01 07:32:32 +02:00
2015-12-14 12:19:37 -06:00
2017-03-25 20:11:19 -07:00
2017-01-10 14:05:11 -05:00
2017-02-03 15:16:45 -05:00
2016-11-03 15:41:11 -04:00
2016-11-03 15:41:11 -04:00
2016-03-22 15:36:02 -07:00
2016-06-27 16:31:25 +01:00
2016-04-12 19:54:58 +01:00
2017-01-17 14:38:43 -05:00
2017-02-20 11:13:37 -05:00
2017-02-09 15:17:30 +01:00
2016-05-17 17:14:21 -06:00
2017-02-15 11:56:07 -06:00
2017-02-17 12:08:05 -05:00
2016-09-27 21:52:00 -04:00
2016-09-27 21:52:00 -04:00
2016-05-08 23:46:14 -04:00
2016-04-26 12:00:48 -04:00
2017-03-28 22:32:42 -07:00
2017-01-09 16:07:38 -05:00
2017-03-16 20:33:56 -07:00
2016-04-04 22:11:20 -04:00
2017-01-29 19:17:23 -05:00
2017-01-10 18:31:55 -08:00
2015-12-18 17:48:51 -08:00
2016-05-20 17:58:30 -07:00
2016-11-17 08:33:20 -07:00
2016-12-16 00:13:38 +02:00
2016-12-16 00:13:32 +02:00
2016-04-30 09:26:55 -07:00