Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
commit8f280309030331a912fd8924c129d8bd59e1bdc7
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 18 Nov 2015 17:07:24 +0000 (18 17:07 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 18 Nov 2015 17:07:24 +0000 (18 17:07 +0000)
tree782e835f9f3cc152c3a868746108df551e38f62a
parent7199c89d8c6bbd0eda2cadb0d3fc7149934202bf
parentca4fa82fe66076284f702adcfe7c319ebbf909ec
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

Block layer patches

# gpg: Signature made Wed 18 Nov 2015 15:28:32 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"

* remotes/kevin/tags/for-upstream:
  block: Call external_snapshot_clean after blockdev-snapshot
  blockdev: Add missing bdrv_unref() in drive-backup
  iotests: fix race in 030
  nand: fix address overflow

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