From: Arnd Bergmann Date: Sat, 26 Jul 2014 10:20:21 +0000 (+0200) Subject: Merge tag 'misc-for-3.17' of git://github.com/hisilicon/linux-hisi into next/soc X-Git-Tag: omap-for-v3.17/fixes-against-rc2~122^2~12 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71b4807a82d00a1d80d7ef73167ffa824db7d461;p=pandora-kernel.git 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 --- 71b4807a82d00a1d80d7ef73167ffa824db7d461 Reading git-diff-tree failed