Merge tag 'misc-for-3.17' of git://github.com/hisilicon/linux-hisi into next/soc