diff options
| author |   Peter Maydell <peter.maydell@linaro.org> | 2015-07-22 16:22:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-22 16:22:49 +0100 |
| commit | 3edf6b3f1e68104dba692337fdcecdba39e73c59 (patch) | |
| tree | bc8c6dd0941bbcc43604b8f22306084e71409899 /hw/misc/omap_clk.c | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (diff) | |
| parent | qxl: Fix new function name for spice-server library (diff) | |
| download | qemu-3edf6b3f1e68104dba692337fdcecdba39e73c59.tar.xz qemu-3edf6b3f1e68104dba692337fdcecdba39e73c59.zip | |
Merge remote-tracking branch 'remotes/elmarco/tags/for-upstream' into staging
qxl: build fix for 2.4
# gpg: Signature made Wed Jul 22 15:55:00 2015 BST using DSA key ID F43F0992
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-Andre Lureau <marcandre.lureau@gmail.com>"
# gpg: aka "Marc-Andre Lureau <marc-andre.lureau@nokia.com>"
# gpg: aka "Marc-André Lureau <marc-andre.lureau@nokia.com>"
# gpg: aka "Marc-André Lureau (elmarco) <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 7346 2483 9404 4E20 ABFF 7D48 D864 9487 F43F 0992
* remotes/elmarco/tags/for-upstream:
qxl: Fix new function name for spice-server library
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/omap_clk.c')
0 files changed, 0 insertions, 0 deletions