tree 1c709cd8a65747fde8363ce593b77e040c14e3e4
parent 2983573e491d1e201e802eafa3553ba33d1fd50b
parent c2183d1e9b3f313dd8ba2b1b0197c8d9fb86a7ae
author Linus Torvalds <torvalds@linux-foundation.org> 1314202482 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1314202482 -0700

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: 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