Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140308-1' into...
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Mar 2014 11:48:42 +0000 (11:48 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Mar 2014 11:48:43 +0000 (11:48 +0000)
commit16513b1b45a3fc6889c6173bc9a211a027a5ac0f
treea574c5e8ae6b3906773303f6e80a7d55abc90e24
parentf53f3d0a00b6df39ce8dfca942608e5b6a9a4f71
parent464400f6a5583eafb466595add435a3a33ea980f
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140308-1' into staging

migration/next for 20140308

# gpg: Signature made Sat 08 Mar 2014 21:26:01 GMT using RSA key ID 5872D723
# gpg: Can't check signature: public key not found

* remotes/juanquintela/tags/migration/20140308-1:
  migration: extend section_start/end traces
  vl: add system_wakeup_request tracepoint
  qemu_file: Fix mismerge of "use fwrite() correctly"
  XBZRLE: Fix qemu crash when resize the xbzrle cache

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>