diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-17 09:16:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-05-17 09:16:00 +0100 |
| commit | c98e7937119503d06dbb494b7e4806ec66a27df0 (patch) | |
| tree | 864e3365ebfca703e16e62e83ce2acce911618a9 /hw/misc/imx31_ccm.c | |
| parent | 70f87e0f0aa04f764dabaeb3ed71ff195748076a (diff) | |
| parent | 9892663dc486755b5534ff8a77913edc5ea28c79 (diff) | |
| download | focaccia-qemu-c98e7937119503d06dbb494b7e4806ec66a27df0.tar.gz focaccia-qemu-c98e7937119503d06dbb494b7e4806ec66a27df0.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp updates # gpg: Signature made Mon 16 May 2016 20:22:36 BST using RSA key ID FB6B2F1D # gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>" # gpg: aka "Samuel Thibault <sthibault@debian.org>" # gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" # 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: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6 # Subkey fingerprint: F632 74CD C630 0873 CB3D 29D9 E3E5 1CE8 FB6B 2F1D * remotes/thibault/tags/samuel-thibault: slirp: Clean up osdep.h related header inclusions slirp: Remove some unused code from slirp.h slirp: Remove obsolete backward-compatibility cruft slirp: Clean up slirp_config.h Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/imx31_ccm.c')
0 files changed, 0 insertions, 0 deletions