Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 16:23:03 +0000 (09:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Sep 2009 16:23:03 +0000 (09:23 -0700)
commit9eead2a8115d2a6aecf267c292f751f7761fa5f8
tree133cc2c9616bbc53b92fdf68137621a11e3c80c6
parent6f130478e24d810078c3f0ee292bcc4ec034dcce
parent79a9d99434b104c562f30f21b75317667f444793
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: add fusectl interface to max_background
  fuse: limit user-specified values of max background requests
  fuse: use drop_nlink() instead of direct nlink manipulation
  fuse: document protocol version negotiation
  fuse: make the number of max background requests and congestion threshold tunable
fs/fuse/dev.c
fs/fuse/inode.c