diff options
| author | Peter Maydell | 2016-04-08 12:54:18 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-04-08 12:54:19 +0200 |
| commit | 3be4f4d724852025f2b58d3c4133e1cca576a4de (patch) | |
| tree | 36c7f62eb1a9e405cc81f4831c12fb96e069a931 /hw/misc/pci-testdev.c | |
| parent | Merge remote-tracking branch 'remotes/xtensa/tags/20160408-xtensa' into staging (diff) | |
| parent | spapr: Fix ibm,lrdr-capacity (diff) | |
| download | qemu-3be4f4d724852025f2b58d3c4133e1cca576a4de.tar.gz qemu-3be4f4d724852025f2b58d3c4133e1cca576a4de.tar.xz qemu-3be4f4d724852025f2b58d3c4133e1cca576a4de.zip | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160408' into staging
ppc patch queue for 2016-04-08
Just a single bugfix for spapr in this batch, but I want to make sure
it gets in for 2.6.
# gpg: Signature made Fri 08 Apr 2016 06:02:45 BST 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.6-20160408:
spapr: Fix ibm,lrdr-capacity
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/pci-testdev.c')
0 files changed, 0 insertions, 0 deletions