David S. Miller f83f715195 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor comment merge conflict in mlx5. Staging driver has a fixup due to the skb->xmit_more changes in 'net-next', but was removed in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-05 14:14:19 -07:00
..
asm	nds32: Perf porting	2018-11-06 18:01:40 +08:00
asm-generic	fls: change parameter to unsigned int	2019-01-04 13:13:46 -08:00
linux	Drop flex_arrays	2019-03-12 10:04:03 -07:00
nolibc	tools headers: Move the nolibc header from rcutorture to tools/include/nolibc/	2019-01-25 15:37:13 -08:00
tools	tools: bpf: fix license for a compat header file	2018-09-19 23:49:58 +02:00
trace/events	tools/lib/lockdep: Remove private kernel headers	2017-06-05 09:28:14 +02:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-05 14:14:19 -07:00