Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 17 Oct 2007 22:05:58 +0000 (15:05 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 17 Oct 2007 22:05:58 +0000 (15:05 -0700)
commit9d8190f87b5458160ba75d05e8ad6abefbe48a26
tree7abeb91aa2a40b91004f53520b7bf1f2c80aab7e
parentc2f73fd07d2ce4605b404f34395eb734a7ba9967
parent982c37cfb6e61c0e64634abc2e305d757c1405b2
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: 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