From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 9 Mar 2012 18:29:55 +0000 (-0600)
Subject: Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf75fec175d00885c7ae06e5917bde86110c386a;p=qemu.git

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
---

bf75fec175d00885c7ae06e5917bde86110c386a