diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-08 14:07:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-08 14:07:32 +0100 |
| commit | 2e29dd7c44db30e3d3c108ab2a622cbdac6d16f0 (patch) | |
| tree | d8a5849382f9416d86eea1f332d08edf25b19fdd /include/ui/console.h | |
| parent | 0daba1f037ab85be7a9ff7ee37ba6b644c5e7977 (diff) | |
| parent | 0ba98885a0e965a17df214ab12b819ef630d8a14 (diff) | |
| download | focaccia-qemu-2e29dd7c44db30e3d3c108ab2a622cbdac6d16f0.tar.gz focaccia-qemu-2e29dd7c44db30e3d3c108ab2a622cbdac6d16f0.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri Jun 5 20:59:07 2015 BST using RSA key ID AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # 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: macio: remove remainder_len DBDMA_io property macio: update comment/constants to reflect the new code macio: switch pmac_dma_write() over to new offset/len implementation macio: switch pmac_dma_read() over to new offset/len implementation fdc-test: Test state for existing cases more thoroughly fdc: Fix MSR.RQM flag fdc: Disentangle phases in fdctrl_read_data() fdc: Code cleanup in fdctrl_write_data() fdc: Use phase in fdctrl_write_data() fdc: Introduce fdctrl->phase fdc: Rename fdctrl_set_fifo() to fdctrl_to_result_phase() fdc: Rename fdctrl_reset_fifo() to fdctrl_to_command_phase() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/console.h')
0 files changed, 0 insertions, 0 deletions