www.infradead.org Git - users/dwmw2/qemu.git/commit

author	Peter Maydell <peter.maydell@linaro.org>
	Thu, 3 Sep 2015 08:50:37 +0000 (09:50 +0100)
committer	Peter Maydell <peter.maydell@linaro.org>
	Thu, 3 Sep 2015 08:50:37 +0000 (09:50 +0100)
commit	0eac5986fc4cfe845d6d656c3a4dc29e004b3a3e
tree	0e00d8248d8c8e337e96b3a3499c9b11af949f9d	tree
parent	f8b8091d2779d956011a3fb83ff60dbf7465c71d	commit \| diff
parent	e12f3784097a26a1ba51be420f41038b4c0ae5d1	commit \| diff

Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging

# gpg: Signature made Wed 02 Sep 2015 17:01:33 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  block: more check for replaced node
  MAINTAINERS: add responsible person for Parallels format driver

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