diff options
| author | Peter Maydell | 2019-07-12 16:38:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-12 16:38:22 +0200 |
| commit | 1316b1ddc8a05e418c8134243f8bff8cccbbccb1 (patch) | |
| tree | 76a60f9909d15237449b8e7ef98e7e21d94f8c5d /hw/timer/nrf51_timer.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-4.1-20190712' into... (diff) | |
| parent | file-posix: Use max transfer length/segment count only for SCSI passthrough (diff) | |
| download | qemu-1316b1ddc8a05e418c8134243f8bff8cccbbccb1.tar.gz qemu-1316b1ddc8a05e418c8134243f8bff8cccbbccb1.tar.xz qemu-1316b1ddc8a05e418c8134243f8bff8cccbbccb1.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- file-posix: Fix max transfer length for non-SCSI-passthrough
- iotests: Fix 082 reference output
# gpg: Signature made Fri 12 Jul 2019 14:49:14 BST
# gpg: using RSA key 7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
file-posix: Use max transfer length/segment count only for SCSI passthrough
iotests: Update 082 expected output
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/timer/nrf51_timer.c')
0 files changed, 0 insertions, 0 deletions