From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 27 Jan 2012 15:00:03 +0000 (-0600)
Subject: Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging
X-Git-Tag: v1.1-rc0~521
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=31841e463fc069f3370f85060fbe450b3ff664b4;p=qemu.git

Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging

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

31841e463fc069f3370f85060fbe450b3ff664b4