summary refs log tree commit diff stats
path: root/hw/bt/core.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-01-22 10:32:58 +0000
committerPeter Maydell <peter.maydell@linaro.org>2018-01-22 10:32:58 +0000
commitf7c6b96c3e639e871bb929038a1b82ded7f39437 (patch)
tree685e6f29252f91934753e6f703f9bf6f5b8f6b12 /hw/bt/core.c
parentb384cd95eb9c6f73ad84ed1bb0717a26e29cc78f (diff)
parent3161906df88a471b09c38fff9a618ff83beea0c3 (diff)
downloadfocaccia-qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.tar.gz
focaccia-qemu-f7c6b96c3e639e871bb929038a1b82ded7f39437.zip
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri 19 Jan 2018 22:31:27 GMT
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jnsnow/tags/ide-pull-request:
  hw/ide: Remove duplicated definitions from ahci_internal.h
  ide: abort TRIM operation for invalid range
  ide: move ide_sect_range_ok() up
  ide: pass IDEState to trim AIO callback

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