| commit | 71b4807a82d00a1d80d7ef73167ffa824db7d461 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Jul 26 12:20:21 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Jul 26 12:20:21 2014 +0200 |
| tree | 974ddf9ee204e904b09b6380643a12cf40a52707 | |
| parent | 96bda115ec552ff75319f85828f6c333d101b401 [diff] | |
| parent | 4dfad0696da39f4c05ac5cadde9648a650830993 [diff] |
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>