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>