From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 26 Nov 2012 14:19:07 +0000 (-0600)
Subject: Merge remote-tracking branch 'spice/spice.v64' into staging
X-Git-Tag: pull-nvme-20200902~6970
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fb43a4807ec06307048018d93a7f9e0828308bb5;p=qemu-nvme.git

Merge remote-tracking branch 'spice/spice.v64' into staging

* spice/spice.v64:
  spice: add new spice-server callbacks to ui/spice-display.c
  Fix the inconsistency in x509-dh-key-file parameter

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

fb43a4807ec06307048018d93a7f9e0828308bb5