]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 30 Apr 2015 19:34:54 +0000 (20:34 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 30 Apr 2015 19:34:54 +0000 (20:34 +0100)
commit5bccbb04a4abba7af4398de992bf06d585fd1333
tree4cf4b6eed5b634b06354df55722841cccfd6f5f3
parentf90f5b9a9aa41e5ea47dc7a0f3e1f99196f485c3
parent4a4d614ff56b4cf15e83629946afe51dc116053f
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block patches

# gpg: Signature made Thu Apr 30 19:51:16 2015 BST using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  Enable NVMe start controller for Windows guest.
  MAINTAINERS: Add qemu-block list where missing
  MAINTAINERS: make block layer core Kevin Wolf's responsibility
  MAINTAINERS: make image fuzzer Stefan Hajnoczi's responsibility
  MAINTAINERS: make block I/O path Stefan Hajnoczi's responsibility
  MAINTAINERS: split out image formats
  MAINTAINERS: make virtio-blk Stefan Hajnoczi's responsibility

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