Merge branch 'kvm-arm-cleanup' from git://github.com/columbia/linux-kvm-arm.git