diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-30 19:43:08 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-30 19:43:08 +0300 |
| commit | b07911593719828cac023bdcf6bf4da1c9ba546f (patch) | |
| tree | c4d2f66e6f2506e5b5439ffca0449e646f677b33 /MAINTAINERS | |
| parent | 52a623bd6189b6ea8f06a0d7594c7604deaab24a (diff) | |
| parent | 4d8a991d460d4fa4829beaffdcba45a217ca0fa7 (diff) | |
| download | linux-b07911593719828cac023bdcf6bf4da1c9ba546f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker
driver, nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c324460d5042..4c913c81cb49 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2964,7 +2964,7 @@ F: sound/pci/oxygen/ C6X ARCHITECTURE M: Mark Salter <msalter@redhat.com> -M: Aurelien Jacquiot <a-jacquiot@ti.com> +M: Aurelien Jacquiot <jacquiot.aurelien@gmail.com> L: linux-c6x-dev@linux-c6x.org W: http://www.linux-c6x.org/wiki/index.php/Main_Page S: Maintained |