Merge commit 'ffd8b67f5d90dd23aad5f549ed528228de8602e7' into upstream-merge

Merge commit 'ffd8b67f5d90dd23aad5f549ed528228de8602e7' into upstream-merge

* commit 'ffd8b67f5d90dd23aad5f549ed528228de8602e7':
  kvm: Use kvm-kmod headers if available
  monitor: fix dead assignment spotted by clang
  Sparc64: Fix PCI config accessor order
  tcg-sparc: Implement ext32[su]_i64
  tcg-sparc: Implement division properly.
  tcg-sparc: Do not remove %o[012] from 'r' constraint.
  tcg-sparc: Implement add2, sub2, mulu2.
  tcg-sparc: Add tcg_out_arithc.
  vnc_refresh: return if vd->timer is NULL
  qdev: fix thinko leading to guest crashes
  QMP: Don't free async event's 'data'
  dma/sb16: make clang analyzer not complain
  Sparc64: enable real access to PCI configuration space
  Update to SeaBIOS 0.5.1
  make help output be a little more self-consistent
  pc: add rombar to compat properties for pc-0.10 and pc-0.11

Conflicts:
	configure

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>