diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:46:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 12:46:35 -0800 |
| commit | e5a9e8e6890d9b9c7a0f25b03ffdaf28614a9a4c (patch) | |
| tree | 5e8fbbcbb7516c8eca9c431b47c70c752823af39 /fs/nfs | |
| parent | bfa271d026fef5d8db9a95342c38eab6f7b287a2 (diff) | |
| parent | d24fbcda0c4988322949df3d759f1cfb32b32953 (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: Negotiate locking protocol versions.
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions