Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/fixes-non...