Merge remote-tracking branch 'remotes/armbru/tags/for-upstream' into staging
commit844741451001cf1aadecde7e5c7b556b8fc4b70b
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Nov 2014 11:05:54 +0000 (11 11:05 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Nov 2014 11:05:54 +0000 (11 11:05 +0000)
tree2fa6ea88c1b3544af32b23feab241a87c68fb5f3
parent59c4f2ecefe33878bc23219a51d0bd913d46aa97
parentc0787c8dd1906522c9e760cde5e4f74438d0a911
Merge remote-tracking branch 'remotes/armbru/tags/for-upstream' into staging

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>