Files
kernel_arpi/include/linux
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-08 11:11:00 -07:00
2016-06-07 22:07:09 -04:00
2016-06-01 14:56:57 -07:00
2016-05-31 22:12:43 +05:30
2016-05-17 15:48:12 -04:00
2016-05-11 22:37:54 +02:00
2016-05-03 15:07:35 -07:00
2016-05-19 19:12:14 -07:00
2016-05-26 15:35:44 -07:00
2016-05-27 15:57:31 -07:00
2016-06-03 19:37:21 -04:00
2016-05-17 15:48:12 -04:00
2016-05-17 15:47:55 -04:00
2016-05-23 17:04:14 -07:00
2016-05-23 17:04:14 -07:00
2016-05-19 19:12:14 -07:00
2016-05-26 00:04:58 -04:00
2016-05-26 15:35:44 -07:00
2016-06-03 19:37:21 -04:00
2016-05-19 19:12:14 -07:00
2016-05-19 19:12:14 -07:00
2016-05-08 23:46:14 -04:00
2016-05-20 17:58:30 -07:00
2016-05-19 19:12:14 -07:00
2016-05-23 17:04:14 -07:00
2016-05-20 17:58:30 -07:00