Merge branch 'upstream-merge'

Merge branch 'upstream-merge'

* upstream-merge: (73 commits)
  target-mips: remove useless code in gen_st_cond()
  Fix MIPS SC
  Sparc64: convert ebus to qdev
  sparc64: trap handling corrections
  Sparc32: convert eccmemctl to qdev
  sparc64: fix helper_st_asi little endian case typo
  sparc64: really initialize irq
  sparc64: unify mmu tag matching code
  sparc64: mmu bypass mode correction
  Fix PCI IRQ breakage
  Revert "Fix the PCI header type of APB"
  Fix APB by reverting 16eaedf2668e9b347a59d73346fcc4c764c58348 partially
  Indent ac97 and es1370 according to audio formatting
  qemu/msi: missing braces
  block: Clean up after deleting BHs
  qemu/msi: clean used vectors state on load
  flush pending aio requests
  kvm: Work around borken MSR_GET_INDEX_LIST
  qemu/virtio: mark msi vectors used on load
  qcow2: Fix L1 table memory allocation
  ...

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