diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-01 16:02:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-01 16:02:45 +0100 |
| commit | 87f6ede9bbccc03f337220478fb03fa70fbc3659 (patch) | |
| tree | 5f700dc3912c1a76b8f0267092865b9e7dfc3e6b /version.rc | |
| parent | 051b9980b99dbfba22ea5f79bd3708d513ae121d (diff) | |
| parent | a889bc2bb2a4eef105652be25eacfed74c9f1273 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-2' into staging
vga: add secondary stdvga variant
# gpg: Signature made Mon 28 Apr 2014 10:11:44 BST 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-vga-2:
add secondary-vga to display-vga test
add display-vga test
vga: add secondary stdvga variant
vga: allow non-global vmstate
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'version.rc')
0 files changed, 0 insertions, 0 deletions