diff options
author | Peter Maydell | 2016-06-20 19:14:26 +0200 |
---|---|---|
committer | Peter Maydell | 2016-06-20 19:14:26 +0200 |
commit | 7e13ea57f47710de2c19f22b27b34ab9fb045700 (patch) | |
tree | 85cecfb3f35ef76fc7d9f54725df4f5f2627a149 /hw/ide/qdev.c | |
parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2016-06-20' into... (diff) | |
parent | milkymist: update specification URLs (diff) | |
download | qemu-7e13ea57f47710de2c19f22b27b34ab9fb045700.tar.gz qemu-7e13ea57f47710de2c19f22b27b34ab9fb045700.tar.xz qemu-7e13ea57f47710de2c19f22b27b34ab9fb045700.zip |
Merge remote-tracking branch 'remotes/mwalle/tags/lm32-queue/20160620' into staging
lm32/milkymist: some qomifying
# gpg: Signature made Mon 20 Jun 2016 17:27:53 BST
# gpg: using RSA key 0xB458ABB0D8D378E3
# gpg: Good signature from "Michael Walle <michael@walle.cc>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 2190 3E48 4537 A7C2 90CE 3EB2 B458 ABB0 D8D3 78E3
* remotes/mwalle/tags/lm32-queue/20160620:
milkymist: update specification URLs
hw/intc: QOM'ify lm32_pic.c
hw/display: QOM'ify milkymist-vgafb.c
hw/display: QOM'ify milkymist-tmu2.c
hw/timer: QOM'ify milkymist_sysctl
hw/timer: QOM'ify lm32_timer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/qdev.c')
0 files changed, 0 insertions, 0 deletions