diff options
| author | Peter Maydell | 2016-01-26 10:16:07 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-01-26 10:16:07 +0100 |
| commit | 1535a6d699487740b490369e44f9ca8d305463cd (patch) | |
| tree | 6e26639d54ebf2ceadb8b60a889f5f87a3a42307 /hw/misc/zynq-xadc.c | |
| parent | Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160125' into staging (diff) | |
| parent | fdc: change auto fallback drive for ISA FDC to 288 (diff) | |
| download | qemu-1535a6d699487740b490369e44f9ca8d305463cd.tar.gz qemu-1535a6d699487740b490369e44f9ca8d305463cd.tar.xz qemu-1535a6d699487740b490369e44f9ca8d305463cd.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Mon 25 Jan 2016 19:39:58 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
* remotes/jnsnow/tags/ide-pull-request:
fdc: change auto fallback drive for ISA FDC to 288
qtest/fdc: Support for 2.88MB drives
fdc: rework pick_geometry
fdc: add physical disk sizes
fdc: add drive type option
fdc: Add fallback option
fdc: add pick_drive
fdc: Throw an assertion on misconfigured fd_formats table
fdc: add disk field
fdc: add drive type qapi enum
fdc: reduce number of pick_geometry arguments
fdc: move pick_geometry
ide: Correct the CHS 'cyls_max' limit to be 65535
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/zynq-xadc.c')
0 files changed, 0 insertions, 0 deletions