diff options
| author | Peter Maydell | 2016-10-28 15:29:50 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-10-28 15:29:50 +0200 |
| commit | fd209e4a773dd5a7fea79eaaffd276ebcb99e92a (patch) | |
| tree | 1fd861d96f15c4d148aaf7e6e33920cdebfb159e /linux-user | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | qemu-iotests: Test creating floppy drives (diff) | |
| download | qemu-fd209e4a773dd5a7fea79eaaffd276ebcb99e92a.tar.gz qemu-fd209e4a773dd5a7fea79eaaffd276ebcb99e92a.tar.xz qemu-fd209e4a773dd5a7fea79eaaffd276ebcb99e92a.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Thu 27 Oct 2016 22:15:57 BST
# 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:
qemu-iotests: Test creating floppy drives
fdc: Move qdev properties to FloppyDrive
fdc: Add a floppy drive qdev
fdc: Add a floppy qbus
macio: switch over to new byte-aligned DMA helpers
dma-helpers: explicitly pass alignment into DMA helpers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions