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>

diff --combined MAINTAINERS
index c47709d860a2da2f1ff416445a9f87e8d4dc9a7b,a316bc3f305dea7ee465b9a4773089dd3373cf71..dc0aa5424e8700c0ed6503a445f48968f991b98d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -234,7 -234,6 +234,7 @@@ L: kvm@vger.kernel.or
  S: Supported
  F: kvm-*
  F: */kvm.*
 +F: include/sysemu/kvm*.h
  
  ARM
  M: Peter Maydell <peter.maydell@linaro.org>
@@@ -1123,7 -1122,6 +1123,7 @@@ Network device backend
  M: Jason Wang <jasowang@redhat.com>
  S: Maintained
  F: net/
 +F: include/net/
  T: git git://github.com/jasowang/qemu.git net
  
  Netmap network backend
@@@ -1219,11 -1217,11 +1219,12 @@@ 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/
  F: net/slirp.c
 +F: include/net/slirp.h
  T: git git://git.kiszka.org/qemu.git queues/slirp
  
  Tracing