diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-11 12:15:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-11 12:15:52 -0500 |
| commit | 7677e24f3db8466c7d6014a794b1e425bc7929ba (patch) | |
| tree | 2231c7456a6c179206b4cf892d8e80c016ff8ba8 /hw/collie.c | |
| parent | 248bfdc9f53a85b82e3ff39c5122d8849f61ee65 (diff) | |
| parent | 0cdd3d14447da1a04e778c219c77db8b96f9cf33 (diff) | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
kvm: i8254: Fix conversion of in-kernel to userspace state
kvm/apic: correct short memset
Diffstat (limited to 'hw/collie.c')
0 files changed, 0 insertions, 0 deletions