diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-12-04 09:49:28 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-12-04 09:49:28 +0000 |
| commit | f33d046d233084f908825bc1a4ec79f1796ca803 (patch) | |
| tree | 7eb745ab9fd69d43402003639e0e2b90670d243b /target-cris/machine.c | |
| parent | 4c65fed8bdf96780735dbdb92a8bd0d6b6526cc3 (diff) | |
| parent | ab8bf1d735133df5b5847bef0b0bea496d614a5a (diff) | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.5-20151204' into staging
ppc patch queue for 2.5 2015-12-04
This contains some last minute QOM behaviour fixes from Markus
Armbruster.
# gpg: Signature made Fri 04 Dec 2015 06:43:54 GMT using RSA key ID 20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-2.5-20151204:
spapr_drc: Change value of property "fdt" from null back to {}
spapr_drc: Make device "spapr-dr-connector" unavailable with -device
spapr_drc: Handle visitor errors properly
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-cris/machine.c')
0 files changed, 0 insertions, 0 deletions