From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 19 Nov 2011 11:17:11 +0000 (+0000)
Subject: Merge branch 'ppc-1.0' of git://repo.or.cz/qemu/agraf
X-Git-Tag: qemu-xen-4.3.0-rc1~1990^2~6
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=05a86f23e5ca83348eface349429341cefb8697b;p=qemu-upstream-4.3-testing.git

Merge branch 'ppc-1.0' of git://repo.or.cz/qemu/agraf

* 'ppc-1.0' of git://repo.or.cz/qemu/agraf:
  pseries: Fix qdev.id handling in the VIO bus code
  pseries: Allow kernel's early debug output to work
  pseries: Default reg for vty should be SPAPR_VTY_BASE_ADDRESS
  pseries: Check we have a chardev in spapr_vty_init()
  pseries: Fix buggy spapr_vio_find_by_reg()
  pseries: Correct RAM size check for SLOF
  PPC: Fix for the gdb single step problem on an rfi instruction
  tcg-ppc64: Fix compile errors for userspace only builds with gcc 4.6
  pseries: Fix initialization of sPAPREnvironment structure
---

05a86f23e5ca83348eface349429341cefb8697b