From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 11 Jan 2016 16:09:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160111-1' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6;p=qemu.git

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>
---

7b8a354d4716ab2c201fad04c22b8d4a16a1b8c6