Merge branch 'armsoc/pxa' of git://github.com/hzhuang1/linux into next/boards