diff options
| author | Arnd Bergmann <[email protected]> | 2014-07-26 12:20:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2014-07-26 12:20:21 +0200 |
| commit | 71b4807a82d00a1d80d7ef73167ffa824db7d461 (patch) | |
| tree | 974ddf9ee204e904b09b6380643a12cf40a52707 | |
| parent | 96bda115ec552ff75319f85828f6c333d101b401 (diff) | |
| parent | 4dfad0696da39f4c05ac5cadde9648a650830993 (diff) | |
Merge tag 'misc-for-3.17' of git://github.com/hisilicon/linux-hisi into next/soc
Merge "update MAINTAINERS to add Hisilicon SoC maintainer" from Wei Xu:
* tag 'misc-for-3.17' of git://github.com/hisilicon/linux-hisi:
MAINTAINERS:ARM:hisi: add Hisilicon SoC family
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 61a8f486306b..16458d98594f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -965,6 +965,14 @@ F: arch/arm/mach-pxa/hx4700.c F: arch/arm/mach-pxa/include/mach/hx4700.h F: sound/soc/pxa/hx4700.c +ARM/HISILICON SOC SUPPORT +M: Wei Xu <[email protected]> +L: [email protected] (moderated for non-subscribers) +W: http://www.hisilicon.com +S: Supported +T: git git://github.com/hisilicon/linux-hisi.git +F: arch/arm/mach-hisi/ + ARM/HP JORNADA 7XX MACHINE SUPPORT M: Kristoffer Ericson <[email protected]> W: www.jlime.com |