]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/armbru/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Nov 2014 11:05:54 +0000 (11:05 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Nov 2014 11:05:54 +0000 (11:05 +0000)
Patches to MAINTAINERS that haven't been picked up

# gpg: Signature made Tue 11 Nov 2014 08:46:55 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/for-upstream:
  Add Migration maintainer
  MAINTAINERS: add section for QEMU Guest Agent
  MAINTAINERS: add myself as bootdevice.c maintainer

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge