summary refs log tree commit diff stats
path: root/hw/i2c/omap_i2c.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-02-28 12:02:07 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-02-28 12:02:07 +0000
commit093a2af7b67e98808dbb7c5364ac21602bec0881 (patch)
tree9b5f95fdf3ca280cce9c29d97b94af99a0b1d09f /hw/i2c/omap_i2c.c
parent4f9ca54d1272dd5750345d8802e567d519d1c4c6 (diff)
parent3e6f45446b11ccc20b4b751f70331f03d70369b8 (diff)
downloadfocaccia-qemu-093a2af7b67e98808dbb7c5364ac21602bec0881.tar.gz
focaccia-qemu-093a2af7b67e98808dbb7c5364ac21602bec0881.zip
Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-02-25-v2' into staging
nbd patches for 2019-02-25

- iotest failure fixes for tests related to NBD

# gpg: Signature made Tue 26 Feb 2019 16:46:15 GMT
# gpg:                using RSA key A7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2019-02-25-v2:
  iotests: avoid broken pipe with certtool
  iotests: ensure we print nbd server log on error
  iotests: handle TypeError for Python 3 in test 242

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i2c/omap_i2c.c')
0 files changed, 0 insertions, 0 deletions