David S. Miller c1c8626fce Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net ... Lots of overlapping changes, mostly trivial in nature. The mlxsw conflict was resolving using the example resolution at: https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c Signed-off-by: David S. Miller <davem@davemloft.net>		2018-08-05 13:04:31 -07:00
..
asm	selftests/bpf: add architecture-agnostic headers	2018-05-10 00:40:58 +02:00
asm-generic	tools/headers: Synchronize kernel ABI headers, v4.17-rc1	2018-04-17 09:47:39 -03:00
drm	tools headers uapi: Synchronize drm/drm.h	2018-06-25 11:59:36 -03:00
linux	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-05 13:04:31 -07:00
sound	tools/headers: Synchronize kernel ABI headers, v4.17-rc1	2018-04-17 09:47:39 -03:00