summary refs log tree commit diff stats
path: root/hw/i2c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2016-11-04 09:26:24 +0000
committerStefan Hajnoczi <stefanha@redhat.com>2016-11-04 09:26:24 +0000
commit9226682a401f34b10fd79dfe17ba334da0800747 (patch)
treeaf3b43298cde18ae33b0ae2c90bc764a2ba7f191 /hw/i2c
parent199a5bde46b0eab898ab1ec591f423000302569f (diff)
parent021746c131cdfeab9d82ff918795a9f18d20d7ae (diff)
downloadfocaccia-qemu-9226682a401f34b10fd79dfe17ba334da0800747.tar.gz
focaccia-qemu-9226682a401f34b10fd79dfe17ba334da0800747.zip
Merge remote-tracking branch 'sstabellini/tags/xen-20161102-tag' into staging
Xen 2016/11/02

# gpg: Signature made Wed 02 Nov 2016 07:28:40 PM GMT
# gpg:                using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
# gpg:                 aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90

* sstabellini/tags/xen-20161102-tag:
  PCMachineState: introduce acpi_build_enabled field
  hw/xen/xen_pvdev: Include qemu/log.h for qemu_log_vprintf()

Message-id: alpine.DEB.2.10.1611021227530.19454@sstabellini-ThinkPad-X260
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/i2c')
0 files changed, 0 insertions, 0 deletions