David S. Miller 446bf64b61 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-08-19 11:54:03 -07:00
..
asm	tools uapi: fix Alpha support	2019-02-10 19:16:24 -08:00
asm-generic	tools headers UAPI: Update tools's copy of mman.h headers	2019-07-29 09:02:58 -03:00
drm	tools headers UAPI: Update tools's copy of drm.h headers	2019-07-29 09:03:42 -03:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-08-19 11:54:03 -07:00
sound	tools include uapi: Sync sound/asound.h copy	2019-04-16 12:36:20 -03:00