]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d2f38a0 ea804ca)
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)
# 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


Trivial merge
Qemu copy for testing