tree b4c25878d5bcd36558af71e019ff288a81013a70
parent a87f39543a9259f671c5413723311180ee2ad2a8
parent f8b7ee38b3ed4ec2da5cc0529cf0cf82c8589805
author Peter Maydell <peter.maydell@linaro.org> 1392057066 +0000
committer Peter Maydell <peter.maydell@linaro.org> 1392057066 +0000

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 <peter.maydell@linaro.org>