From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 29 Feb 2016 11:49:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160229-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1da90c34c9e76e0f4fa9faaa670518443b9bda9c;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160229-1' into staging

ui: spice dmabuf fix, MAINTAINERS updates.

# gpg: Signature made Mon 29 Feb 2016 10:41:15 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-ui-20160229-1:
  MAINTAINERS: Add an entry for the include/ui/ folder
  MAINTAINERS: Add spice-display.h to the SPICE section
  spice/gl: Enable dmabuf only for spice >= 0.13.1

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

1da90c34c9e76e0f4fa9faaa670518443b9bda9c