David S. Miller e0ada51db9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were simple overlapping changes in microchip driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-04-21 16:32:48 -04:00
..
asm	bpf: fix broken BPF selftest build	2017-12-12 09:51:12 -08:00
asm-generic	tools include asm-generic: Grab errno.h and errno-base.h	2018-01-23 09:51:37 -03:00
drm	tools headers uapi: Synchronize i915_drm.h	2018-04-05 14:48:51 -03:00
linux	bpf: btf: Sync bpf.h and btf.h to tools/	2018-04-19 21:46:25 +02:00
sound	tools headers: Synchronize sound/asound.h	2018-02-02 16:41:49 -03:00