Merge branch 'kvm-arm-fixes-3.10' of git://github.com/columbia/linux-kvm-arm into kvm-master