diff options
| author | Avi Kivity <avi@redhat.com> | 2011-10-09 13:11:50 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-10-09 13:11:50 +0200 |
| commit | df2921d326d0903ff684759ac8508f87396b7018 (patch) | |
| tree | b9f9d2a2a116413591362278b2dc9d148c7ee943 /qapi-schema-test.json | |
| parent | 306f66b42f961e38442d1721523dbb4906b33afb (diff) | |
| parent | 02d6516c8ba00bdd6d96b622f000cb28c3449f43 (diff) | |
Merge remote-tracking branch 'upstream' into memory/batch
* upstream: (87 commits)
target-alpha: Fix compilation errors for 32 bit hosts
target-alpha: Add high-resolution access to wall clock and an alarm.
target-alpha: Implement HALT IPR.
target-alpha: Implement WAIT IPR.
target-alpha: Add CLIPPER emulation.
target-alpha: Add custom PALcode image for CLIPPER emulation.
target-alpha: Honor icount for RPCC instruction.
tcg/s390: Remove unused tcg_out_addi()
tcg/ia64: Remove unused tcg_out_addi()
ARM: fix segfault
ppc64: Fix linker script
pseries: Implement set-time-of-day RTAS function
pseries: Refactor spapr irq allocation
PPC: Clean up BookE timer code
PPC: booke timers
KVM: PPC: Use HIOR setting for -M pseries with PR KVM
KVM: Update kernel headers
KVM: Update kernel headers
PPC: Fix heathrow PIC to use little endian MMIO
PPC: Fix via-cuda memory registration
...
Conflicts:
hw/milkymist-uart.c
hw/ppce500_mpc8544ds.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qapi-schema-test.json')
0 files changed, 0 insertions, 0 deletions