From: Linus Torvalds Date: Wed, 10 Aug 2011 18:08:06 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d55140ce3a7b36241171bd78c75a5ee85de20439;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.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: Add mount option to check uid of device being mounted = expect uid eCryptfs: Fix payload_len unitialized variable warning eCryptfs: fix compile error eCryptfs: Return error when lower file pointer is NULL --- d55140ce3a7b36241171bd78c75a5ee85de20439