]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a283b1b eed9686)
Merge remote-tracking branch 'aneesh/for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Feb 2012 13:23:55 +0000 (07:23 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Feb 2012 13:23:55 +0000 (07:23 -0600)
* aneesh/for-upstream:
  hw/9pfs: Remove O_NOATIME flag from 9pfs open() calls in readonly mode
  hw/9pfs: Update MAINTAINERS file
  fsdev: Fix parameter parsing for proxy helper
  hw/9pfs: Fix crash when mounting with synthfs
  hw/9pfs: Preserve S_ISGID
  hw/9pfs: Add new security model mapped-file.

1  2 
hw/9pfs/virtio-9p-device.c patch | diff1 | diff2 | blob | history
qemu-options.hx patch | diff1 | diff2 | blob | history

diff --cc hw/9pfs/virtio-9p-device.c
Simple merge
diff --cc qemu-options.hx
Simple merge
Qemu copy for testing