From: Blue Swirl <blauwirbel@gmail.com>
Date: Tue, 1 May 2012 09:28:59 +0000 (+0000)
Subject: Merge branch 'prep-up' of git://repo.or.cz/qemu/afaerber
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ee6610785e4979770409fc675f7d889aa390aae5;p=qemu.git

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
---

ee6610785e4979770409fc675f7d889aa390aae5