]> git.ipfire.org Git - thirdparty/qemu.git/commit
projects / thirdparty / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a87f395 f8b7ee3)
Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Feb 2014 18:31:06 +0000 (18:31 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 10 Feb 2014 18:31:06 +0000 (18:31 +0000)
commit702f6df9602a445103c55ac21af11c7aaedb9b34
treeb4c25878d5bcd36558af71e019ff288a81013a70tree | snapshot
parenta87f39543a9259f671c5413723311180ee2ad2a8commit | diff
parentf8b7ee38b3ed4ec2da5cc0529cf0cf82c8589805commit | diff
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>
Mirror of https://git.qemu.org/git/qemu.git