tree e8c1b1a9f3ea6b6a0edb972f082d0d7338c98af4
parent 59e3af21e94bd56f6a31ba774786a2bfc753581b
parent 5d9ec854bfb6f1e122b1d96b344164a71eac5be8
author Linus Torvalds <torvalds@linux-foundation.org> 1231290080 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231290080 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: clean up annotations of fc->lock
  fuse: fix sparse warning in ioctl
  fuse: update interface version
  fuse: add fuse_conn->release()
  fuse: separate out fuse_conn_init() from new_conn()
  fuse: add fuse_ prefix to several functions
  fuse: implement poll support
  fuse: implement unsolicited notification
  fuse: add file kernel handle
  fuse: implement ioctl support
  fuse: don't let fuse_req->end() put the base reference
  fuse: move FUSE_MINOR to miscdevice.h
  fuse: style fixes