From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 23 Jul 2019 09:51:15 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190723' into... 
X-Git-Tag: qemu-xen-4.13.0-rc1~44
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cec9f94f2dec8d34f2de76cdb2f562981858a9ef;p=qemu-xen.git

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190723' into staging

One bugfix and silent a fallthru warning.

# gpg: Signature made Tue 23 Jul 2019 10:33:34 BST
# gpg:                using RSA key E3E32C2CDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (F4BUG) <f4bug@amsat.org>" [full]
# Primary key fingerprint: FAAB E75E 1291 7221 DCFD  6BB2 E3E3 2C2C DEAD C0DE

* remotes/philmd-gitlab/tags/pflash-next-20190723:
  hw/block/pflash_cfi02: Rewrite a fall through comment
  hw/block/pflash_cfi01: Add missing DeviceReset() handler

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

cec9f94f2dec8d34f2de76cdb2f562981858a9ef