| commit | 051732bcbe3cff3fea04dc9042266562fe8b0859 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 24 09:14:42 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 24 09:14:42 2011 -0700 |
| tree | 1c709cd8a65747fde8363ce593b77e040c14e3e4 | |
| parent | 2983573e491d1e201e802eafa3553ba33d1fd50b [diff] | |
| parent | c2183d1e9b3f313dd8ba2b1b0197c8d9fb86a7ae [diff] |
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