Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2011 16:14:42 +0000 (09:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Aug 2011 16:14:42 +0000 (09:14 -0700)
commit051732bcbe3cff3fea04dc9042266562fe8b0859
tree1c709cd8a65747fde8363ce593b77e040c14e3e4
parent2983573e491d1e201e802eafa3553ba33d1fd50b
parentc2183d1e9b3f313dd8ba2b1b0197c8d9fb86a7ae
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: check size of FUSE_NOTIFY_INVAL_ENTRY message
  fuse: mark pages accessed when written to
  fuse: delete dead .write_begin and .write_end aops
  fuse: fix flock
  fuse: fix non-ANSI void function notation
fs/fuse/file.c
fs/fuse/fuse_i.h
fs/fuse/inode.c