diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-09 12:29:55 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-03-09 12:29:55 -0600 |
| commit | bf75fec175d00885c7ae06e5917bde86110c386a (patch) | |
| tree | b1f4d72848359b3ca8e294a371022c6655d2aac2 /qjson.h | |
| parent | 9f1d43b133d6bac0539f0c99497fe59d561a02ea (diff) | |
| parent | 7e680753cfa2986e0a8b3b222b6bf0b003c5eb69 (diff) | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
kvm: fill in padding to help valgrind
kvm: x86: Add user space part for in-kernel i8254
kvm: Add kvm_has_pit_state2 helper
i8254: Open-code timer restore
i8254: Factor out base class for KVM reuse
Diffstat (limited to 'qjson.h')
0 files changed, 0 insertions, 0 deletions