Merge commit '60e0df25e415b00cf35c4d214eaba9dc19aaa9e6' into upstream-merge
commite2f490563d19ebc09c92627c7ee8170bdb5217cc
authorAvi Kivity <avi@redhat.com>
Sun, 15 May 2011 09:58:38 +0000 (15 05:58 -0400)
committerAvi Kivity <avi@redhat.com>
Sun, 15 May 2011 09:58:38 +0000 (15 05:58 -0400)
treeae70b7afc8aea630618f2346425eeafd747fceef
parent786fe18b1b901d4b070040f13fa996172e4327e4
parent60e0df25e415b00cf35c4d214eaba9dc19aaa9e6
Merge commit '60e0df25e415b00cf35c4d214eaba9dc19aaa9e6' into upstream-merge

* commit '60e0df25e415b00cf35c4d214eaba9dc19aaa9e6':
  configure: List available targets in --help output
  target-mips: Fix warning caused by unused local variable
  configure: quote kvm_ppc_pvr
  target-lm32: Remove unused local variables
  target-arm: Fix VMLA, VMLS, VNMLS, VNMLA handling of NaNs
  doc: Add explanation that -alt-grab and -ctrl-grab affect special keys
  sparc64: fix incorrect BPcc target sign extension
  sparc64: fix wrpstate and wrtl on delay slot
  lsi53c895a: Rename 'sense' to 'status'
  xen: Add Xen hypercall for sleep state in the cmos_s3 callback.
  xen: Set running state in xenstore.
  xen: Initialize event channels and io rings

Signed-off-by: Avi Kivity <avi@redhat.com>
configure
hw/pc_piix.c
qemu-options.hx