Merge branch 'kvm-ppc-cap-210' into kvm-master