diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-01 19:29:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-01 19:29:27 +0100 |
| commit | 96b39d8327883094f52b0a3d3f25dba83d6d1d63 (patch) | |
| tree | 23a068874ad3f087193ada44ff41a99297d27b13 /hw/misc/mips_cpc.c | |
| parent | 9a48e3670030148a8d00c8d4d4cd7f051c0d9f39 (diff) | |
| parent | b05528b53354f7373fe15a8225cc475a6a66101a (diff) | |
| download | focaccia-qemu-96b39d8327883094f52b0a3d3f25dba83d6d1d63.tar.gz focaccia-qemu-96b39d8327883094f52b0a3d3f25dba83d6d1d63.zip | |
Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging
Only trivial fixes. # gpg: Signature made Fri 01 Jul 2016 13:39:06 BST # gpg: using DSA key 0x02FC3AEB0101DBC2 # gpg: Good signature from "Greg Kurz <gkurz@fr.ibm.com>" # gpg: aka "Greg Kurz <groug@free.fr>" # gpg: aka "Greg Kurz <gkurz@linux.vnet.ibm.com>" # gpg: aka "Gregory Kurz (Groug) <groug@free.fr>" # gpg: aka "Gregory Kurz (Cimai Technology) <gkurz@cimai.com>" # gpg: aka "Gregory Kurz (Meiosys Technology) <gkurz@meiosys.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: 2BD4 3B44 535E C0A7 9894 DBA2 02FC 3AEB 0101 DBC2 * remotes/gkurz/tags/for-upstream: 9p: synth: drop v9fs_ prefix 9p: don't include <sys/uio.h> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/mips_cpc.c')
0 files changed, 0 insertions, 0 deletions