diff options
| author | Peter Maydell | 2016-06-17 16:31:27 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-17 16:31:27 +0200 |
| commit | da838dfc40cb7e12e2ae7b33236e426e029fed15 (patch) | |
| tree | 3216850d43b871b05bf0dc2674f503250f93fe77 /hw/intc | |
| parent | nbd/client.c: Correct trace format string (diff) | |
| parent | vnc: Wrap vnc initialization code with CONFIG_VNC (diff) | |
| download | qemu-da838dfc40cb7e12e2ae7b33236e426e029fed15.tar.gz qemu-da838dfc40cb7e12e2ae7b33236e426e029fed15.tar.xz qemu-da838dfc40cb7e12e2ae7b33236e426e029fed15.zip | |
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>
Diffstat (limited to 'hw/intc')
0 files changed, 0 insertions, 0 deletions