From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Aug 2010 21:10:43 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... 
X-Git-Tag: v2.6.36-rc3~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e933424c4823596ed231648eeb602b5209960ff6;p=pandora-kernel.git

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:
  eCryptfs: Fix encrypted file name lookup regression
  ecryptfs: properly mark init functions
  fs/ecryptfs: Return -ENOMEM on memory allocation failure
---

e933424c4823596ed231648eeb602b5209960ff6