diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-18 16:39:29 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-18 16:39:29 +0000 |
commit | 059b3527f0229f4d60fd77a317503d42abd5e50f (patch) | |
tree | 0211fd3632bbe6f86569001f9e7e50cc0e8c5794 /block/quorum.c | |
parent | 2dda43bacc79f8e283702614745cd700c637de64 (diff) | |
parent | 2f487a3d40faff1772e14da6b921900915501f9a (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-2' into staging
vnc: fix vmware VGA incompatiblities
# gpg: Signature made Tue 18 Mar 2014 07:23:10 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-vnc-2:
ui/vnc: fix vmware VGA incompatiblities
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/quorum.c')
0 files changed, 0 insertions, 0 deletions