diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-05 13:04:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-05 13:04:31 -0700 |
| commit | c1c8626fcebed467184ffd8de0ab5c9f9d9c3594 (patch) | |
| tree | 2c661fee934f4a7985e4f8e29cd1ba63a330a5e4 /MAINTAINERS | |
| parent | d89d41556141a527030a15233135ba622ba3350d (diff) | |
| parent | 1ffaddd029c867d134a1dde39f540dcc8c52e274 (diff) | |
| download | linux-c1c8626fcebed467184ffd8de0ab5c9f9d9c3594.tar.bz2 | |
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>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fbac980d34e1..82f277462349 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5444,6 +5444,7 @@ F: drivers/iommu/exynos-iommu.c EZchip NPS platform support M: Vineet Gupta <vgupta@synopsys.com> +M: Ofer Levi <oferle@mellanox.com> S: Supported F: arch/arc/plat-eznps F: arch/arc/boot/dts/eznps.dts |