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)
commit71b4807a82d00a1d80d7ef73167ffa824db7d461
tree974ddf9ee204e904b09b6380643a12cf40a52707
parent96bda115ec552ff75319f85828f6c333d101b401
parent4dfad0696da39f4c05ac5cadde9648a650830993
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>
MAINTAINERS