tree c29a01bc5b8351277c0e424bcc4206ba42e06a50
parent d517872ec289f5bfa6bd9f385a90e09483e9949c
parent 58f9b98f8a341c8b7bb0c9b38e492a01fe71d666
author Anthony Liguori <aliguori@us.ibm.com> 1344891551 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1344891551 -0500

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