From: Peter Maydell Date: Mon, 10 Feb 2014 18:31:06 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=702f6df9602a445103c55ac21af11c7aaedb9b34;p=qemu.git Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging * remotes/kvaneesh/for-upstream: hw/9pfs: fix P9_STATS_GEN handling hw/9pfs: make get_st_gen() return ENOTTY error on special files hw/9pfs: handle undefined FS_IOC_GETVERSION case in handle_ioc_getversion() hw/9pfs: fix error handing in local_ioc_getversion() Signed-off-by: Peter Maydell --- 702f6df9602a445103c55ac21af11c7aaedb9b34