]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21fe5bc 2488514)
Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 27 Jan 2012 15:00:03 +0000 (09:00 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 27 Jan 2012 15:00:03 +0000 (09:00 -0600)
* pmaydell/arm-devs.for-upstream:
  arm: SoC model for Calxeda Highbank
  arm_boot: support board IDs more than 16 bits wide
  arm: add secondary cpu boot callbacks to arm_boot.c
  ahci: add support for non-PCI based controllers
  Add xgmac ethernet model


Trivial merge
Qemu copy for testing