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

author	Peter Maydell <peter.maydell@linaro.org>
	Tue, 28 Feb 2017 08:46:03 +0000 (08:46 +0000)
committer	Peter Maydell <peter.maydell@linaro.org>
	Tue, 28 Feb 2017 08:46:03 +0000 (08:46 +0000)
commit	6181478f6395cdd9d6ffd99623d0c9f39ea53606
tree	60a91b8d2122701bd2384d044d8fbc95d67cc4b0	tree
parent	9b9fbe8a4e9eec9072ee2697a6af59144442785f	commit \| diff
parent	1ab17f9f5c63c2798d707aeb22588e4fcc17b2cd	commit \| diff

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

# gpg: Signature made Mon 27 Feb 2017 16:33:23 GMT
# gpg:                using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/block-pull-request:
  tests-aio-multithread: use atomic_read properly
  iscsi: do not use aio_context_acquire/release
  nfs: do not use aio_context_acquire/release
  curl: do not use aio_context_acquire/release

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