Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71b4807a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 96bda115 4dfad069

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -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