From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Jan 2014 18:55:41 +0000 (-0800)
Subject: Merge tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.14-rc1~89
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c2948380b699dfdbb25a7de740392dd9e6f0613;p=kernel%2Fkernel-generic.git

Merge tag 'for-3.14-merge-window' of git://git./linux/kernel/git/ericvh/v9fs

Pull 9p changes from Eric Van Hensbergen:
 "Included are a new cache model for support of mmap, and several
  cleanups across the filesystem and networking portions of the code"

* tag 'for-3.14-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: update documentation
  9P: introduction of a new cache=mmap model.
  net/9p: remove virtio default hack and set appropriate bits instead
  9p: remove useless 'name' variable and assignment
  9p: fix return value in case in v9fs_fid_xattr_set()
  9p: remove useless variable and assignment
  9p: remove useless assignment
  9p: remove unused 'super_block' struct pointer
  9p: remove never used return variable
  9p: remove unused 'p9_fid' struct pointer
  9p: remove unused 'p9_client' struct pointer
---

1c2948380b699dfdbb25a7de740392dd9e6f0613