tree 7abeb91aa2a40b91004f53520b7bf1f2c80aab7e
parent c2f73fd07d2ce4605b404f34395eb734a7ba9967
parent 982c37cfb6e61c0e64634abc2e305d757c1405b2
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1192658758 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1192658758 -0700

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: remove sysctl
  9p: fix bad kconfig cross-dependency
  9p: soften invalidation in loose_mode
  9p: attach-per-user
  9p: rename uid and gid parameters
  9p: define session flags
  9p: Make transports dynamic