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)
commitdc717bfd057ac3d6b75c633d57e501d5e6d5ef50
treefb693fceacd28b9ccc47fe64b925e32bc52298cc
parenta283b1b8eb121dcc086c4850c91b35fed13d2023
parenteed968607d656a218712df47a5e0432c21fd6994
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.
hw/9pfs/virtio-9p-device.c
qemu-options.hx