diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-10-29 12:59:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-29 12:59:15 +0000 |
| commit | ef3a6af5e789ff078d1fef880f9dfb6adf18e8f1 (patch) | |
| tree | f2b4c405cce6352a69ba968599fbb810f3f00aec /tests/multiboot | |
| parent | 285278ca785f5fa9a570927e1c0958a2ca2b2150 (diff) | |
| parent | e69a10f468d8f6aa6c00a4308f5a8e1f2fd6b3a1 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181029-pull-request' into staging
vga: two fixes.
# gpg: Signature made Mon 29 Oct 2018 12:46:20 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20181029-pull-request:
vga_int: remove unused function protype
qxl: store channel id in qxl->id
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/multiboot')
0 files changed, 0 insertions, 0 deletions