]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
projects / users / dwmw2 / qemu.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7497b8d 455b0fd)
Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2015-11-11' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 12 Nov 2015 10:09:14 +0000 (10:09 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 12 Nov 2015 10:09:14 +0000 (10:09 +0000)
error: More error_setg() usage

# gpg: Signature made Wed 11 Nov 2015 17:57:15 GMT using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"

* remotes/armbru/tags/pull-error-2015-11-11:
  error: More error_setg() usage

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
1  2 
block.c patch | diff1 | diff2 | blob | history

diff --cc block.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.