]> git.proxmox.com Git - qemu.git/commit - hw/sun4m.c
projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80ec243 7e973bb)
Merge remote-tracking branch 'kraxel/q35.1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Jan 2013 14:36:52 +0000 (08:36 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Jan 2013 14:43:08 +0000 (08:43 -0600)
commite2848a78b0a6715f94623bdf43ef74d3d08cfe4d
tree6c9f6a0ee2ee6d4ba57795e8c13a1cd7cd5ddd97tree
parent80ec24328607937690d0d620b99e8c24ab29e8f5commit | diff
parent7e973bb2e17f929f47376a3872f7ccdff25a51abcommit | diff
Merge remote-tracking branch 'kraxel/q35.1' into staging

* kraxel/q35.1:
  Makefile: install the "acpi-dsdt.aml" and "q35-acpi-dsdt.aml" blobs too
  pc: rename machine types
  q35: document chipset devices
  q35: add ich9 intel hda controller

Conflicts:
hw/intel-hda.c

aliguori: resolve conflict with static const change from Andreas.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
hw/intel-hda.c diff1 | diff2 | blob | history
Qemu copy for testing