Merge tag 'misc-for-3.17' of git://github.com/hisilicon/linux-hisi into next/soc
authorArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 10:20:21 +0000 (12:20 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 26 Jul 2014 10:20:21 +0000 (12:20 +0200)
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  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge