Merge branch 'kvm-master' into HEAD

Merge more important SMM fixes.