From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 18 Apr 2015 21:45:30 +0000 (-0400)
Subject: Merge tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: omap-for-v4.1/fixes-rc1~94
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dba94f2155f581395ef9608418778e3491b3d470;p=pandora-kernel.git

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

Pull 9pfs updates from Eric Van Hensbergen:
 "Some accumulated cleanup patches for kerneldoc and unused variables as
  well as some lock bug fixes and adding privateport option for RDMA"

* tag 'for-linus-4.1-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  net/9p: add a privport option for RDMA transport.
  fs/9p: Initialize status in v9fs_file_do_lock.
  net/9p: Initialize opts->privport as it should be.
  net/9p: use memcpy() instead of snprintf() in p9_mount_tag_show()
  9p: use unsigned integers for nwqid/count
  9p: do not crash on unknown lock status code
  9p: fix error handling in v9fs_file_do_lock
  9p: remove unused variable in p9_fd_create()
  9p: kerneldoc warning fixes
---

dba94f2155f581395ef9608418778e3491b3d470
Reading git-diff-tree failed