From: Peter Maydell Date: Tue, 17 May 2016 09:35:50 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f5e34a45c78086b73ec4e1a0268ec26169fee80;p=qemu.git Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging # gpg: Signature made Tue 17 May 2016 01:19:39 BST using RSA key ID 81AB73C8 # gpg: Good signature from "Stefan Hajnoczi " # gpg: aka "Stefan Hajnoczi " * remotes/stefanha/tags/block-pull-request: rfifolock: no need to get thread identifier when nesting Signed-off-by: Peter Maydell --- 3f5e34a45c78086b73ec4e1a0268ec26169fee80