David S. Miller 2f184393e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-10-20 10:43:00 -07:00
..
asm	tools headers: Fixup bitsperlong per arch includes	2019-08-20 12:23:00 -03:00
asm-generic	tools headers uapi: Sync asm-generic/mman-common.h with the kernel	2019-09-30 17:28:44 -03:00
drm	tools headers uapi: Sync drm/i915_drm.h with the kernel sources	2019-09-27 09:28:11 -03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-10-20 10:43:00 -07:00
sound	tools include uapi: Sync sound/asound.h copy	2019-04-16 12:36:20 -03:00