]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a854972 4bb9c93)
Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Sat, 2 Jun 2012 23:54:05 +0000 (07:54 +0800)
committerAnthony Liguori <aliguori@us.ibm.com>
Sat, 2 Jun 2012 23:54:05 +0000 (07:54 +0800)
* kwolf/for-anthony:
  ahci: SATA FIS is 20 bytes, not 0x20
  virtio-blk: Fix geometry sector calculation
  block: prevent snapshot mode $TMPDIR symlink attack
  sheepdog: fix return value of do_load_save_vm_state
  virtio: Fix compiler warning for non Linux hosts


Trivial merge
Qemu copy for testing