David S. Miller e561bb29b6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Trivial conflict in net/core/filter.c, a locally computed 'sdif' is now an argument to the function. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-11-28 22:10:54 -08:00
..
asm	tools, perf: add and use optimized ring_buffer_{read_head, write_tail} helpers	2018-10-19 13:43:08 -07:00
asm-generic	xarray: Add XArray marks	2018-10-21 10:45:57 -04:00
linux	Merge branch 'xarray' of git://git.infradead.org/users/willy/linux-dax	2018-10-28 11:35:40 -07: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	2018-11-28 22:10:54 -08:00