From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Sep 2011 14:48:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/ericvh/linux
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=28c51ee3da3be98a3d7ce54250ec0b4d99826bb7;p=~shefty%2Frdma-dev.git

Merge branch 'for-linus' of git://github.com/ericvh/linux

* 'for-linus' of git://github.com/ericvh/linux:
  fs/9p: Use protocol-defined value for lock/getlock 'type' field.
  fs/9p: Always ask new inode in lookup for cache mode disabled
  fs/9p: Add OS dependent open flags in 9p protocol
  net/9p: Fix kernel crash with msize 512K
  fs/9p: Don't update file type when updating file attributes
  fs/9p: Add fid before dentry instantiation
---

28c51ee3da3be98a3d7ce54250ec0b4d99826bb7