Fix VERSION to reflect that we're in 0.15.0-rc1

Signed-off-by: Avi Kivity <[email protected]>

Merge branch 'upstream-merge' into next

* upstream-merge: (118 commits)
  Bump version to reflect v0.15.0-rc0
  Correct spelling of licensed
  Register Linux dyntick timer as per-thread signal
  mc146818rtc: Handle host clock resets
  qemu-timer: Introduce clock reset notifier
  notifier: Pass data argument to callback
  ide: Turn properties any IDE device must have into bus properties
  virtio-serial: Turn props any virtio-serial-bus device must have into bus props
  virtio-serial: Clean up virtser_bus_dev_print() output
  usb-ccid: Drop unused CCIDCardInfo callback print()
  Remove unused USES_X509_AUTH macro from VNC sasl code
  Introduce a 'client_add' monitor command accepting an open FD
  Store VNC auth scheme per-client as well as per-server
  do not reset no_shutdown after we shutdown the vm
  vl.c: Don't limit node count by smp count
  vga: Fix type of lfb/map_addr/end.
  qemu-char: Print strerror message on failure
  qemu-timer: change unix timer to dynticks
  iothread: replace fair_mutex with a condition variable
  report serial devices created with -device in the PIIX4 config space
  ...

Signed-off-by: Avi Kivity <[email protected]>

Update version for 0.13.0-rc0

Signed-off-by: Anthony Liguori <[email protected]>

Merge remote branch 'qemu-kvm/uq/stable-0.12' into stable-0.12

Update version and changelog for release

Signed-off-by: Anthony Liguori <[email protected]>