]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'stefanha/block' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 25 Mar 2013 18:14:20 +0000 (13:14 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 25 Mar 2013 18:14:20 +0000 (13:14 -0500)
commit4b5805de49edec5a81fe810bb612317de6545a38
treed6ad52a98d23d3768ff8025938b08a8fc7d10673
parentd2f38a0acb0a1c5b7ab7621a32d603d08d513bea
parentea804cadf867a0521b9069193db339d041a40689
Merge remote-tracking branch 'stefanha/block' into staging

# By Liu Yuan (1) and Stefan Weil (1)
# Via Stefan Hajnoczi
* stefanha/block:
  block: Add options QDict to bdrv_file_open() prototypes (fix MinGW build)
  rbd: fix compile error