commit | cc92186773df8c9aae8f812fff85e7325e1d7583 | [log] [tgz] |
---|---|---|
author | Anthony Liguori <aliguori@us.ibm.com> | Wed Aug 15 11:15:02 2012 -0500 |
committer | Anthony Liguori <aliguori@us.ibm.com> | Wed Aug 15 11:15:02 2012 -0500 |
tree | 023bfbffa648a28153ab3c5aad978c09e4a20c4b | |
parent | 8fa27d21a993e261137d15def5475ba2c4d8985b [diff] | |
parent | 256d046ca70788e4cb3aad56cda64ad81f19b7cd [diff] |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging * qemu-kvm/uq/master: update-linux-headers.sh: Pull in asm-generic/kvm_para.h kvmvapic: Disable if there is insufficient memory kvm: i8254: Finish time conversion fix kvm: i8254: Cache kernel clock offset in KVMPITState