Merge remote-tracking branch 'tip/x86/cpufeature' into kvm-next
authorPaolo Bonzini <pbonzini@redhat.com>
Thu, 12 Dec 2013 09:46:15 +0000 (10:46 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 12 Dec 2013 09:46:15 +0000 (10:46 +0100)

Trivial merge