]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita16c7a3de597b125a8443ef520af667e788314fd
tree1c709cd8a65747fde8363ce593b77e040c14e3e4
parent5aaddfc0707326242b73b3abd9367aa1afab7980
parent9addcc3b98a8f04ebd623cf81eb1f3f1c49dc340
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
fs/fuse/file.c
fs/fuse/fuse_i.h
fs/fuse/inode.c