| commit | ee6610785e4979770409fc675f7d889aa390aae5 | |
| author | Blue Swirl <blauwirbel@gmail.com> | |
| Tue, 1 May 2012 09:28:59 +0000 (1 09:28 +0000) | ||
| committer | Blue Swirl <blauwirbel@gmail.com> | |
| Tue, 1 May 2012 09:28:59 +0000 (1 09:28 +0000) | ||
| tree | 442b68e184f6743d2f08d23ca4eea4867cfcb52b | treesnapshot (tar.gz zip) |
| parent | 61d25e1548b5e5ec8b670e72e82a2a7b909f9d52 | commitdiff |
| parent | 6c84ce0dc762999591bbef9e76e45cb260fe84e2 | commitdiff |
Merge branch 'prep-up' of git://repo.or.cz/qemu/afaerber
* 'prep-up' of git://repo.or.cz/qemu/afaerber:
prep: Move int-ack register from PReP to Raven PCI emulation
prep: Initialize PC speaker
isa: Add isa_bus_from_device() method
fdc: Parametrize ISA base, IRQ and DMA
i82378/i82374: Do not create DMA controller twice
* 'prep-up' of git://repo.or.cz/qemu/afaerber:
prep: Move int-ack register from PReP to Raven PCI emulation
prep: Initialize PC speaker
isa: Add isa_bus_from_device() method
fdc: Parametrize ISA base, IRQ and DMA
i82378/i82374: Do not create DMA controller twice