]> 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)
commitbea2117c4ce48fae30c844b55c941372c758f628
tree1c709cd8a65747fde8363ce593b77e040c14e3e4
parent2742939f666d103cb30682c770df9648d3e46270
parente5c8d0e9c393d273429431d755a6a90303c63ac4
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