| commit | cec9f94f2dec8d34f2de76cdb2f562981858a9ef | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 23 Jul 2019 09:51:15 +0000 (23 10:51 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 23 Jul 2019 09:51:15 +0000 (23 10:51 +0100) | ||
| tree | 2361e69cb5c53b07bf8bc6b8fe9cef4669f381dc | treesnapshot (tar.gz zip) |
| parent | ecb199b177b3d94c1dfba2e7ba4595d368f780f7 | commitdiff |
| parent | 124e4cfaa42bb5a14eec33ea47d3502b5f46eb33 | commitdiff |
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>
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>