Merge commit 'b784421ce4cc860315f4ec31bbc3d67e91984074' into upstream-merge

Merge commit 'b784421ce4cc860315f4ec31bbc3d67e91984074' into upstream-merge

* commit 'b784421ce4cc860315f4ec31bbc3d67e91984074':
  Fix migration uint8 arrys handled
  softfloat: Drop [s]bits{8, 16, 32, 64} types in favor of [u]int{8, 16, 32, 64}_t
  softfloat: Resolve type mismatches between declaration and implementation
  softfloat: Prepend QEMU-style header with derivation notice
  e1000: Fix multi-descriptor packet checksum offload
  rbd: don't link with -lcrypto
  hw/arm_sysctl.c: Add the Versatile Express system registers
  remove qemu_get_clock
  add a generic scaling mechanism for timers
  Add qcow2 documentation
  hw/xen_disk: aio_inflight not released in handling ioreq when nr_segments==0
  Improve error handling in do_snapshot_blkdev()
  Fix ATA SMART and CHECK POWER MODE
  Don't allow multiwrites against a block device without underlying medium
  tools: Use real async.c instead of stubs
  Add error message for loading snapshot without VM state
  block/qcow: Don't ignore immediate read/write and other failures
  block/vdi: Don't ignore immediate read/write failures

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