Merge branch 'upstream-merge' into next

Merge branch 'upstream-merge' into next

* upstream-merge: (131 commits)
  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
  PPC: Qdev'ify e500 pci
  PPC: Implement e500 (FSL) MMU
  PPC MPC7544DS: Use new TLB helper function
  PPC: Add another 64 bits to instruction feature mask
  PPC: Add GS MSR definition
  PPC: Make MPC8544DS emulation work w/o KVM
  PPC: Make MPC8544DS obey -cpu switch
  Fix off-by-one error in sizing pSeries hcall table
  kvm: ppc: detect old headers
  ppc64: Fix out-of-tree builds
  kvm: ppc: warn user on PAGE_SIZE mismatch
  monitor: add PPC BookE SPRs
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>