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	selftests/bpf: add architecture-agnostic headers	2018-05-10 00:40:58 +02:00
asm-generic	tools arch uapi: Update asm-generic/unistd.h and arm64 unistd.h copies	2018-10-31 09:57:51 -03:00
drm	tools headers uapi: Update tools's copy of drm/drm.h	2018-09-11 11:07:56 -03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-11-28 22:10:54 -08:00
sound	tools include uapi: Update asound.h copy	2018-10-31 09:57:52 -03:00