Merge branch 'for-linus/xen/core' into for-linus/xen/master

* for-linus/xen/core:
  xen: honour VCPU availability on boot