Merge branch 'cpu-hotplug'

* cpu-hotplug:
  arm, kvm: fix double lock on cpu_add_remove_lock