From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 6 Jan 2012 14:14:28 +0000 (-0600)
Subject: Merge remote-tracking branch 'aneesh/for-upstream' into staging
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=74b728e4f3a4be43c71a58e4c8102b6d700a0018;p=qemu-xen-4.3-testing.git

Merge remote-tracking branch 'aneesh/for-upstream' into staging

* aneesh/for-upstream:
  hw/9pfs: Add support to use named socket for proxy FS
  hw/9pfs: man page for proxy helper
  hw/9pfs: Documentation changes related to proxy fs
  hw/9pfs: Proxy getversion
  hw/9pfs: xattr interfaces in proxy filesystem driver
  hw/9pfs: File ownership and others
  hw/9pfs: Add stat/readlink/statfs for proxy FS
  hw/9pfs: Create other filesystem objects
  hw/9pfs: Open and create files
  hw/9pfs: File system helper process for qemu 9p proxy FS
  hw/9pfs: Add new proxy filesystem driver
  hw/9pfs: Add validation to {un}marshal code
  hw/9pfs: Move pdu_marshal/unmarshal code to a seperate file
  hw/9pfs: Move opt validation to FsDriver callback
---

74b728e4f3a4be43c71a58e4c8102b6d700a0018