Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
commit4d41e121664893e5e338f41fbd36be4a2578c8d6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Nov 2008 19:39:09 +0000 (15 11:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Nov 2008 19:39:09 +0000 (15 11:39 -0800)
tree3626b5d50600c54ae5eeaa6f317920456fe9deda
parent6ca2cb99377d6315def3c63c2a980a229556bf64
parent4ff429e658c00bcf5101eabbebd4f711572a64cb
Merge branch 'for-linus' of git://git./linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: restrict RDMA usage