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>2016-01-12 10:38:08 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-01-12 10:38:08 +0000
commitcf57c2f18b4fc7d9207d5321be18ddab214965bb (patch)
treeb2191ee983aa072c38c319554cfb3474a3d20df3 /hw/i2c/omap_i2c.c
parent7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6 (diff)
parentc5620e658e4061ac1bd51377966590d5aca2ad05 (diff)
downloadfocaccia-qemu-cf57c2f18b4fc7d9207d5321be18ddab214965bb.tar.gz
focaccia-qemu-cf57c2f18b4fc7d9207d5321be18ddab214965bb.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Mon 11 Jan 2016 19:16:27 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  libqos/ahci: organize header
  qtest/ahci: ATAPI data tests
  libqos/ahci: add ahci_exec
  libqos/ahci: allow nondata commands for ahci_io variants
  libqos: allow zero-size allocations
  libqos/ahci: Switch to mutable properties
  libqos/ahci: ATAPI identify
  libqos/ahci: ATAPI support
  ahci-test: fix memory leak
  ide: ahci: reset ncq object to unused on error
  macio: fix overflow in lba to offset conversion for ATAPI devices

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