David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
asm	selftests/bpf: add architecture-agnostic headers	2018-05-10 00:40:58 +02:00
asm-generic	tools uapi asm-generic: Synchronize ioctls.h	2018-11-19 12:31:45 -08:00
drm	tools headers uapi: Synchronize i915_drm.h	2018-11-19 12:17:42 -08:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
sound	tools include uapi: Update asound.h copy	2018-10-31 09:57:52 -03:00