Merge remote-tracking branch 'stefanha/block' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:18:25 +0000 (08:18 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 26 Nov 2012 14:18:25 +0000 (08:18 -0600)
* stefanha/block:
  ide: Fix status register after short PRDs
  ide: Fix crash with too long PRD
  use int64_t for return values from rbd instead of int
  vdi: don't override libuuid symbols
  block: add bdrv_reopen() support for raw hdev, floppy, and cdrom

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge