Merge remote-tracking branch 'aneesh/for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 May 2013 13:13:20 +0000 (08:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 29 May 2013 13:13:20 +0000 (08:13 -0500)
# By Aneesh Kumar K.V (3) and Gabriel de Perthuis (1)
# Via Aneesh Kumar K.V
* aneesh/for-upstream:
  hw/9pfs: Be robust against paths without FS_IOC_GETVERSION
  hw/9pfs: Use O_NOFOLLOW when opening files on server
  hw/9pfs: use O_NOFOLLOW for mapped readlink operation
  hw/9pfs: Fix segfault with 9p2000.u

Message-id: 87zjvevx4s.fsf@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge