| commit | b13d3c6e8ab6ac53e8c1858a9c837cb6ba3bbef0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 05 13:25:24 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 05 13:25:24 2010 -0800 |
| tree | 4c0b6cba4975b0d7871096e0a99406d450b0272f | |
| parent | e213e26ab3988c516c06eba4dcd030ac052f6dc9 [diff] | |
| parent | 5717144a01d701614cfdb15f09ed562d720cf3db [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: fs/9p: Add hardlink support to .u extension 9P2010.L handshake: .L protocol negotiation 9P2010.L handshake: Remove "dotu" variable 9P2010.L handshake: Add mount option 9P2010.L handshake: Add VFS flags net/9p: Handle mount errors correctly. net/9p: Remove MAX_9P_CHAN limit net/9p: Add multi channel support.