diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-23 16:19:04 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-23 16:19:04 +0100 |
| commit | 14a7fe1a26733502d86b2c3d7b16f32a55f16da2 (patch) | |
| tree | 01a9a8b7bcc6a735a0823c9166860b44c0ef3787 /hw/net/virtio-net.c | |
| parent | e499ff0707b14066158676623674253bd1153fc6 (diff) | |
| parent | 064983cb0a18c5adc4ec791c00792f74ebf50ca4 (diff) | |
| download | focaccia-qemu-14a7fe1a26733502d86b2c3d7b16f32a55f16da2.tar.gz focaccia-qemu-14a7fe1a26733502d86b2c3d7b16f32a55f16da2.zip | |
Merge remote-tracking branch 'remotes/otubo/tags/pull-seccomp-20170622' into staging
pull-seccomp-20170622 # gpg: Signature made Thu 22 Jun 2017 09:01:01 BST # gpg: using RSA key 0xDF32E7C0F0FFF9A2 # gpg: Good signature from "Eduardo Otubo (Senior Software Engineer) <otubo@redhat.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: D67E 1B50 9374 86B4 0723 DBAB DF32 E7C0 F0FF F9A2 * remotes/otubo/tags/pull-seccomp-20170622: MAINTAINERS: seccomp: change email contact for Eduardo Otubo Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
0 files changed, 0 insertions, 0 deletions