diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-11 16:09:50 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-11 16:09:50 +0000 |
| commit | 7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6 (patch) | |
| tree | 8b3d2f11cfbcf8c3ae5d8350829a341556f2679d /hw/ide/macio.c | |
| parent | ac0d9dbf33608d0b178e0bd414ec7397ada17834 (diff) | |
| parent | fea9b3ca9cc4685f89e0b929a61e51098fbb4f49 (diff) | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160111-1' into staging
target-arm queue:
* i.MX: move i.MX31 CCM object to register array
* xilinx_axidma: remove dead code
* disas/libvixl: Update to upstream VIXL 1.12
* virt: Support legacy -nic command line syntax
# gpg: Signature made Mon 11 Jan 2016 16:05:58 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
* remotes/pmaydell/tags/pull-target-arm-20160111-1:
hw/arm/virt: Support legacy -nic command line syntax
disas/libvixl: Update to upstream VIXL 1.12
hw/dma/xilinx_axidma: remove dead code
i.MX: move i.MX31 CCM object to register array
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ide/macio.c')
0 files changed, 0 insertions, 0 deletions