| commit | 6a1f9d0c1fbf186d3d68cb2af43d047637c93072 | |
| author | Anthony Liguori <aliguori@us.ibm.com> | |
| Mon, 13 Aug 2012 20:59:11 +0000 (13 15:59 -0500) | ||
| committer | Anthony Liguori <aliguori@us.ibm.com> | |
| Mon, 13 Aug 2012 20:59:11 +0000 (13 15:59 -0500) | ||
| tree | c29a01bc5b8351277c0e424bcc4206ba42e06a50 | treesnapshot (tar.gz zip) |
| parent | d517872ec289f5bfa6bd9f385a90e09483e9949c | commitdiff |
| parent | 58f9b98f8a341c8b7bb0c9b38e492a01fe71d666 | commitdiff |
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
* 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