From: Anthony Liguori Date: Mon, 1 Jul 2013 14:03:04 +0000 (-0500) Subject: Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging X-Git-Tag: v2.7.1~2582 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1acd5a373905ddb28957842256a038956941f332;p=mirror_qemu.git Merge remote-tracking branch 'agraf/ppc-for-upstream' into staging # By Alexander Graf (12) and others # Via Alexander Graf * agraf/ppc-for-upstream: (32 commits) PPC: Ignore writes to L2CR mac-io: Add escc-legacy memory alias region PPC: Newworld: Add second uninorth control register set PPC: Newworld: Add uninorth token register PPC: Add clock-frequency export for Mac machines PPC: Introduce an alias cache for faster lookups PPC: Fix GDB read on code area for PPC6xx PPC: Add dump_mmu() for 6xx target-ppc: Introduce unrealizefn for PowerPCCPU booke_ppc: limit booke timer to max when timeout overflow Graphics: Switch to 800x600x32 as default mode pseries: Update MAINTAINERS information target-ppc kvm: save cr register pseries: Fix compiler warning (conversion of pointer to integral value) spapr-rtas: add CPU argument to RTAS calls target-ppc: Change default machine for 64-bit ppc: do not register IABR SPR twice for 603e target-ppc: Drop redundant flags assignments from CPU families mpc8544_guts: Turn qdev initfn into instance_init mpc8544_guts: QOM'ify ... Message-id: 1372556709-23868-1-git-send-email-agraf@suse.de Signed-off-by: Anthony Liguori --- 1acd5a373905ddb28957842256a038956941f332