From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 17 Jun 2016 14:31:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=da838dfc40cb7e12e2ae7b33236e426e029fed15;p=qemu.git

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-pull-request' into staging

Machine queue, 2016-06-17

# gpg: Signature made Fri 17 Jun 2016 14:45:48 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-pull-request:
  vnc: Wrap vnc initialization code with CONFIG_VNC
  qdev: Use GList for global properties

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

da838dfc40cb7e12e2ae7b33236e426e029fed15