Skip to content
Commit a8114540 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

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

* for-linus/xen/core:
  xen: honour VCPU availability on boot
parents 1943689c 53152f95
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment