diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:13:42 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-04-21 14:13:42 +0800 |
| commit | 1f6a2b80252dd323a766ebc2742bb9078476a5b8 (patch) | |
| tree | 9e5018a422781c54723740ff40426d9b61e94f6e /MAINTAINERS | |
| parent | b52e1c65e105805827038c232f5bba6f269c09e6 (diff) | |
| parent | e9cd0f1ce300f433a478bd1973dea112b5fbb800 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
Conflicts:
keep -fno-pic flag in arch/arm64/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e84ae12578ca..f9b662e19e45 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9020,10 +9020,12 @@ S: Maintained F: drivers/net/ethernet/dlink/sundance.c SUPERH +M: Yoshinori Sato <ysato@users.sourceforge.jp> +M: Rich Felker <dalias@libc.org> L: linux-sh@vger.kernel.org W: http://www.linux-sh.org Q: http://patchwork.kernel.org/project/linux-sh/list/ -S: Orphan +S: Maintained F: Documentation/sh/ F: arch/sh/ F: drivers/sh/ |