diff options
| author | Peter Maydell | 2018-08-23 18:35:48 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-08-23 18:35:48 +0200 |
| commit | 5ccac548faf041ff5229a8e8342e3be14a34c8af (patch) | |
| tree | 9d633dd7865ec6139108b93a64d99ec8fdcbf224 /hw/i2c/imx_i2c.c | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.1-pull-re... (diff) | |
| parent | block: iotest to catch abort on forced blockjob cancel (diff) | |
| download | qemu-5ccac548faf041ff5229a8e8342e3be14a34c8af.tar.gz qemu-5ccac548faf041ff5229a8e8342e3be14a34c8af.tar.xz qemu-5ccac548faf041ff5229a8e8342e3be14a34c8af.zip | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 22 Aug 2018 04:40:38 BST
# gpg: using RSA key BDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block: iotest to catch abort on forced blockjob cancel
block: for jobs, do not clear user_paused until after the resume
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i2c/imx_i2c.c')
0 files changed, 0 insertions, 0 deletions