From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 13 Aug 2012 20:59:11 +0000 (-0500)
Subject: Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6a1f9d0c1fbf186d3d68cb2af43d047637c93072;p=qemu.git

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

* pmaydell/arm-devs.next:
  arm: Move some ARM devices into libhw
  ssd0323: abort() instead of exit(1) on error.
  hw/sd.c: make sd_wp_addr() return bool
  hw/sd.c: make sd_dataready() return bool
  hw/sd.c: convert binary variables to bool
  hw/sd.c: introduce wrapper for conversion address to wp group
  hw/sd.c: make sd_wp_addr() accept 64 bit address argument
  hw/sd.c: convert wp_groups in SDState to bitfield
  armv7m: Guard against no -kernel argument
  hw/armv7m_nvic: Fix incorrect default for num-irqs property
---

6a1f9d0c1fbf186d3d68cb2af43d047637c93072