]> git.proxmox.com Git - qemu.git/commit - hw/fdc.c
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 61d25e1 6c84ce0)
Merge branch 'prep-up' of git://repo.or.cz/qemu/afaerber
authorBlue Swirl <blauwirbel@gmail.com>
Tue, 1 May 2012 09:28:59 +0000 (09:28 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Tue, 1 May 2012 09:28:59 +0000 (09:28 +0000)
commitee6610785e4979770409fc675f7d889aa390aae5
tree442b68e184f6743d2f08d23ca4eea4867cfcb52btree
parent61d25e1548b5e5ec8b670e72e82a2a7b909f9d52commit | diff
parent6c84ce0dc762999591bbef9e76e45cb260fe84e2commit | diff
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
Qemu copy for testing