From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Aug 2011 16:14:42 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Tag: v3.1-rc4~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=051732bcbe3cff3fea04dc9042266562fe8b0859;p=thirdparty%2Fkernel%2Flinux.git

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

051732bcbe3cff3fea04dc9042266562fe8b0859