From: Peter Maydell Date: Fri, 8 Apr 2016 10:54:18 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.6-20160408' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3be4f4d724852025f2b58d3c4133e1cca576a4de;p=qemu.git 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 " # gpg: aka "David Gibson (Red Hat) " # gpg: aka "David Gibson (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 --- 3be4f4d724852025f2b58d3c4133e1cca576a4de