diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-09 05:14:55 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-09 05:14:55 +0000 |
| commit | 4ba364b47275fe428723442987b57b260b215dba (patch) | |
| tree | f7d1b8e51c9a3ea1f2f70077af66137f47c8fc2e /MAINTAINERS | |
| parent | 8519c8e0730039e2925ddb7cc8cfa588a1ef9d13 (diff) | |
| parent | eda509fa0ac7d4870b7ff206fd6c33cdd06c2d55 (diff) | |
| download | qemu-4ba364b47275fe428723442987b57b260b215dba.zip qemu-4ba364b47275fe428723442987b57b260b215dba.tar.gz qemu-4ba364b47275fe428723442987b57b260b215dba.tar.bz2 | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Add Samuel Thibault as slirp maintainer
# gpg: Signature made Tue 08 Mar 2016 20:43:01 GMT 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 sufficiently trusted signatures!
# gpg: It is not certain 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:
MAINTAINERS: Add Samuel Thibault as slirp maintainer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c47709d..dc0aa54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1219,6 +1219,7 @@ F: scripts/qmp/ T: git git://repo.or.cz/qemu/armbru.git qapi-next SLIRP +M: Samuel Thibault <samuel.thibault@ens-lyon.org> M: Jan Kiszka <jan.kiszka@siemens.com> S: Maintained F: slirp/ |