From: Linus Torvalds Date: Sun, 29 May 2011 21:13:25 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bd1bfe40ac6bdf9593da29b822bc301b77a97d6a;p=linux-beck.git 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: Remove ecryptfs_header_cache_2 eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose() eCryptfs: Return useful code from contains_ecryptfs_marker eCryptfs: Fix new inode race condition eCryptfs: Cleanup inode initialization code eCryptfs: Consolidate inode functions into inode.c --- bd1bfe40ac6bdf9593da29b822bc301b77a97d6a