diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 12:39:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-12 12:39:21 -0800 |
| commit | 6733e54b669c600eb8e451939ad55130db664fed (patch) | |
| tree | 2a8c24c856fa3f5d7d58a3eb39da943ca1c57e65 /include/linux/netfilter.h | |
| parent | bcf8a3dfcb274cf6654a19e12e244f3af8c0d355 (diff) | |
| parent | 451d0f599934fd97faf54a5d7954b518e66192cb (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: Notifying the kernel of deletion.
fuse: support ioctl on directories
fuse: Use kcalloc instead of kzalloc to allocate array
fuse: llseek optimize SEEK_CUR and SEEK_SET
Diffstat (limited to 'include/linux/netfilter.h')
0 files changed, 0 insertions, 0 deletions