From: Anthony Liguori Date: Wed, 8 Feb 2012 13:23:55 +0000 (-0600) Subject: Merge remote-tracking branch 'aneesh/for-upstream' into staging X-Git-Tag: v1.1-rc0~421 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=dc717bfd057ac3d6b75c633d57e501d5e6d5ef50;p=qemu.git Merge remote-tracking branch 'aneesh/for-upstream' into staging * 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. --- dc717bfd057ac3d6b75c633d57e501d5e6d5ef50