]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'pm215/tags/pull-target-arm-20161128' into staging
authorStefan Hajnoczi <stefanha@redhat.com>
Tue, 29 Nov 2016 09:28:24 +0000 (09:28 +0000)
committerStefan Hajnoczi <stefanha@redhat.com>
Tue, 29 Nov 2016 09:28:24 +0000 (09:28 +0000)
target-arm queue:
 * hw/arm/boot: fix crash handling device trees with no /chosen
   or /memory nodes
 * generic-loader: only set PC if a CPU is specified

# gpg: Signature made Mon 28 Nov 2016 01:47:21 PM GMT
# gpg:                using RSA key 0x3C2525ED14360CDE
# 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>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* pm215/tags/pull-target-arm-20161128:
  arm: Create /chosen and /memory devicetree nodes if necessary
  generic-loader: file: Only set a PC if a CPU is specified

Message-id: 1480341071-5367-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

Trivial merge