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 <arnd@arndb.de>

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 <xuwei5@hisilicon.com>
+L:      linux-arm-kernel@lists.infradead.org (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 <kristoffer.ericson@gmail.com>
 W:      www.jlime.com