projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e52e713 a058bfb)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 18:07:50 +0000 (11:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 18:07:50 +0000 (11:07 -0700)
commitaaab184276a6e20834f63735d433f94ef52a0497
tree89469029763d1fe713960200ac16014fef7c2167tree | snapshot
parente52e713ec30a31e9a4663d9aebbaae5ec07466a6commit | diff
parenta058bfbbeca576cf7c93ac4f16092f13f414434ecommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/ecryptfs/ecryptfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  MAINTAINERS: Update eCryptfs mailing list
  eCryptfs: Allow 2 scatterlist entries for encrypted filenames
  eCryptfs: Clear i_nlink in rmdir
MAINTAINERS diff1 | diff2 | blob | history
fs/ecryptfs/inode.c diff1 | diff2 | blob | history
John Crispins staging tree