Merge branch 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel...