summary refs log tree commit diff stats
path: root/hw/ide/pci.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-09-11 10:27:07 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-09-11 10:27:07 +0100
commita6e8c1dacfd37d34542e33600dcc50b7683b735a (patch)
treeba2587f74d992720abd6d238066ad5f340812544 /hw/ide/pci.c
parentfcea73709b966a7ded9efa7b106ea50c7fe9025c (diff)
parent6fa9ba09dbf4eb8b52bcb47d6820957f1b77ee0b (diff)
downloadfocaccia-qemu-a6e8c1dacfd37d34542e33600dcc50b7683b735a.tar.gz
focaccia-qemu-a6e8c1dacfd37d34542e33600dcc50b7683b735a.zip
Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.11-pull-request' into staging
# gpg: Signature made Sun 10 Sep 2017 17:17:28 BST
# gpg:                using RSA key 0xF30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-for-2.11-pull-request:
  target/m68k: Switch fpu_rom from make_floatx80() to make_floatx80_init()

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