Merge tag 'armsoc-3.9' of git://server.prisktech.co.nz/git/linuxwmt into next/soc