]> bbs.cooldavid.org Git - net-next-2.6.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:10:43 +0000 (14:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Aug 2010 21:10:43 +0000 (14:10 -0700)
commite933424c4823596ed231648eeb602b5209960ff6
treed1bec768605bd4cc91326b80a02fa6472384bf08
parent8f2a0029b8aaed9fb37d775dbe527e163920b129
parent93c3fe40c279f002906ad14584c30671097d4394
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  eCryptfs: Fix encrypted file name lookup regression
  ecryptfs: properly mark init functions
  fs/ecryptfs: Return -ENOMEM on memory allocation failure