commit | 4d41e121664893e5e338f41fbd36be4a2578c8d6 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 15 11:39:09 2008 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Nov 15 11:39:09 2008 -0800 |
tree | 3626b5d50600c54ae5eeaa6f317920456fe9deda | |
parent | 6ca2cb99377d6315def3c63c2a980a229556bf64 [diff] | |
parent | 4ff429e658c00bcf5101eabbebd4f711572a64cb [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: 9p: restrict RDMA usage