From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 29 May 2012 09:30:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'kwolf/for-anthony' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~4061
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=306761537f03d31087dabe284523e08d050bc789;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'kwolf/for-anthony' into staging

* kwolf/for-anthony:
  fdc-test: introduced qtest no_media_on_start and cmos qtest for floppy
  fdc: fix media detection
  fdc: floppy drive should be visible after start without media
  qemu-iotests: mark 035 qcow2-only
  qcow2: Check qcow2_alloc_clusters_at() return value
  sheepdog: use heap instead of stack for BDRVSheepdogState
  sheepdog: return -errno on error
  sheepdog: mark image as snapshot when tag is specified
  qemu-img: Explain how rebase operation can be used to perform a 'diff' operation.
  qcow2: don't leak buffer for unexpected qcow_version in header
---

306761537f03d31087dabe284523e08d050bc789