Merge remote-tracking branch 'remotes/kvaneesh/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 4 Sep 2014 17:34:28 +0000 (18:34 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 4 Sep 2014 17:34:28 +0000 (18:34 +0100)
* remotes/kvaneesh/for-upstream:
  hw/9pfs: Don't return type from host in readdir on local 9p filesystem
  hw/9pfs: Use little-endian format for xattr values

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge