Merge remote branch 'qemu-kvm/uq/master' into staging
commitc5d69e6bbf37bf5e3882060764b15e018e6a5321
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 16 Feb 2011 14:47:07 +0000 (16 08:47 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 16 Feb 2011 14:47:07 +0000 (16 08:47 -0600)
treee246e96bdfffbc5e07682c5a39ea7a65482a5935
parent630ecca0da959e65acad1ee0bf3a631bbb7ee052
parent0ec329dab938e2d97d12a91f8ed15fec27b325e0
Merge remote branch 'qemu-kvm/uq/master' into staging
cpus.c