projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* '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


Trivial merge
Domain: SDK / Emulator;