summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 01:20:32 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-20 01:20:32 +0400
commit9b030e2006546366c832911ca5eb9e785408795b (patch)
treefe2b5913249c047fc8d7f851f7a6a0049825e2d3 /mm
parent76e506a754c9519ba0a948b475a62f31fac8b599 (diff)
parent9f37622f897a90ad3c3da5c14d94d8f3ffc62b70 (diff)
downloadlinux-9b030e2006546366c832911ca5eb9e785408795b.tar.xz
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: Turn lower lookup error messages into debug messages eCryptfs: Copy lower directory inode times and size on link ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode ecryptfs: fix error code for missing xattrs in lower fs eCryptfs: Decrypt symlink target for stat size eCryptfs: Strip metadata in xattr flag in encrypted view eCryptfs: Clear buffer before reading in metadata xattr eCryptfs: Rename ecryptfs_crypt_stat.num_header_bytes_at_front eCryptfs: Fix metadata in xattr feature regression
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions