projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcf8a3d 451d0f5)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 20:39:21 +0000 (12:39 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Jan 2012 20:39:21 +0000 (12:39 -0800)
* '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

1  2 
fs/fuse/dir.c patch | diff1 | diff2 | blob | history
fs/fuse/fuse_i.h patch | diff1 | diff2 | blob | history

diff --cc fs/fuse/dir.c
Simple merge
diff --cc fs/fuse/fuse_i.h
Simple merge
John Crispins staging tree