diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | qemu-options.hx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap index fad2aff5aa..7677047950 100644 --- a/.mailmap +++ b/.mailmap @@ -56,6 +56,7 @@ Aleksandar Rikalo <aleksandar.rikalo@syrmia.com> <aleksandar.rikalo@rt-rk.com> Alexander Graf <agraf@csgraf.de> <agraf@suse.de> Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com> Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com> +Damien Hedde <damien.hedde@dahe.fr> <damien.hedde@greensocs.com> Filip Bozuta <filip.bozuta@syrmia.com> <filip.bozuta@rt-rk.com.com> Frederic Konrad <konrad.frederic@yahoo.fr> <fred.konrad@greensocs.com> Frederic Konrad <konrad.frederic@yahoo.fr> <konrad@adacore.com> diff --git a/MAINTAINERS b/MAINTAINERS index d51ddee0b9..98cb2d64cf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2666,7 +2666,6 @@ T: git https://gitlab.com/jsnow/qemu.git jobs T: git https://gitlab.com/vsementsov/qemu.git block Compute Express Link -M: Ben Widawsky <ben.widawsky@intel.com> M: Jonathan Cameron <jonathan.cameron@huawei.com> R: Fan Ni <fan.ni@samsung.com> S: Supported @@ -3363,7 +3362,7 @@ F: .gitlab-ci.d/opensbi/ Clock framework M: Luc Michel <luc@lmichel.fr> -R: Damien Hedde <damien.hedde@greensocs.com> +R: Damien Hedde <damien.hedde@dahe.fr> S: Maintained F: include/hw/clock.h F: include/hw/qdev-clock.h diff --git a/qemu-options.hx b/qemu-options.hx index d42f60fb91..59bdf67a2c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1606,7 +1606,7 @@ SRST .. parsed-literal:: - |qemu_system_x86| -drive file=a -drive file=b" + |qemu_system_x86| -drive file=a -drive file=b is interpreted like: |