Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
commit3f5e34a45c78086b73ec4e1a0268ec26169fee80
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 17 May 2016 09:35:50 +0000 (17 10:35 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 17 May 2016 09:35:50 +0000 (17 10:35 +0100)
treed7902c9f53d8353b00d65334e1fdd4f1c642b920
parentc98e7937119503d06dbb494b7e4806ec66a27df0
parentde3e15a705cbb4b54b2a749f8d5131c9f1666fb3
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 <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/block-pull-request:
  rfifolock: no need to get thread identifier when nesting

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