diff options
author | Peter Maydell | 2019-07-16 18:02:44 +0200 |
---|---|---|
committer | Peter Maydell | 2019-07-16 18:02:44 +0200 |
commit | a1a4d49f60d2b899620ee2be4ebb991c4a90a026 (patch) | |
tree | e171f34afb0e36c472fc07fc1a826e4cec5deb4d /linux-user/sparc64/target_elf.h | |
parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190716' into staging (diff) | |
parent | hw/block/pflash_cfi01: Start state machine as READY to accept commands (diff) | |
download | qemu-a1a4d49f60d2b899620ee2be4ebb991c4a90a026.tar.gz qemu-a1a4d49f60d2b899620ee2be4ebb991c4a90a026.tar.xz qemu-a1a4d49f60d2b899620ee2be4ebb991c4a90a026.zip |
Merge remote-tracking branch 'remotes/philmd-gitlab/tags/pflash-next-20190716' into staging
pflash-next patches for v4.1.0-rc1
Trivial pflash fixes for rc1.
# gpg: Signature made Tue 16 Jul 2019 16:59:53 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-20190716:
hw/block/pflash_cfi01: Start state machine as READY to accept commands
hw/block/pflash_cfi02: Explicit switch fallthrough for ERASE commands
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/sparc64/target_elf.h')
0 files changed, 0 insertions, 0 deletions