tree a574c5e8ae6b3906773303f6e80a7d55abc90e24
parent f53f3d0a00b6df39ce8dfca942608e5b6a9a4f71
parent 464400f6a5583eafb466595add435a3a33ea980f
author Peter Maydell <peter.maydell@linaro.org> 1394452122 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1394452123 +0000
mergetag object 464400f6a5583eafb466595add435a3a33ea980f
 type commit
 tag migration/20140308-1
 tagger Juan Quintela <quintela@redhat.com> 1394313961 +0100
 
 migration/next for 20140308
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJTG4rpAAoJEPSH7xhYctcjZeYP+gJC74TE//zk+k66l623MBms
 3UcH787HzsqzpTaK3UBDEhTuprwzT0lQ32qBfFupmPg/91GwQhWFE0y5DTjS5b0f
 NoUUECml4sZvogldYzajPMKgx9QywdCrigXLmON5EfS+OTKY/W/wE1yLIAaQlGHS
 vzaUI8QnX6/7UR/sgkLpiAMTFCLEtmW6Ql2KjL3vbrlX0b05/vAvYIaLSzQ2d7SO
 Gh8H1j9zBvuIR3W/prJcg4KjynuCRhRAq6U00MYFW7UeEFF1ah0rvB6S4VT3MRH8
 rshYgv7xmCNR1cCK3VZEKImgmdKLMYcgRtS1VH5d6bLcrVFnBOfBy78Byx5jseFm
 rGsaXMi6/C1onzn5qrinwJLX1y0m7e/aW2KwIbvjt80sB2dCMQC4R4ZmVzMpWxAt
 v1ox+d2+1HQgtqM0G1iLeTaDMfh6F+npRkFHlEftbh7Pyw5tD+CPvFgLTZ+Gxk9a
 LSzAnFL4SZJNpjUWtn5vGioVH8QBUHdT4E8y5EcNiCEAa2Oa0nEE+Dy/8EbF186A
 IqVtkNBfLC7et6tvv9K2IqLHuAWzjMDeLVYMZCDxukcgaBfNfwttCG55COxtU0Uh
 TVs+XCKPP0J5MH7w7Bn99/+YGXON2oM7upjUFxQaTq1Edh89BLWsJfBqh53Tm6H2
 DBmgKVrP7eBiEtgkHnlB
 =e53r
 -----END PGP SIGNATURE-----

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>