tree ccfd684b6534dc808607d5fc9b1bb3c99a238b2b
parent 7bc4a4ce68f8c6d064ea949446852e996526f692
parent b8b80cf37c7f0e32729262f805bc0fa81c3e9d12
author Linus Torvalds <torvalds@linux-foundation.org> 1294785368 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294785368 -0800

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: Don't set dentry->d_op in create routines
  fs/9p: fix spelling typo
  fs/9p: TREADLINK bugfix
  net/9p: Use proper data types
  fs/9p: Simplify the .L create operation
  fs/9p: Move dotl inode operations into a seperate file
  fs/9p: fix menu presentation
  fs/9p: Fix the return error on default acl removal
  fs/9p: Remove unnecessary semicolons