Merge branch 'kvm-updates/3.1' of git://github.com/avikivity/kvm