| commit | d55140ce3a7b36241171bd78c75a5ee85de20439 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 10 11:08:06 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Aug 10 11:08:06 2011 -0700 |
| tree | 427fe4fb647492333a91532952fb47d7c77bcc18 | |
| parent | af9d220bac41dc3201893e1601cc7c44f7da4498 [diff] | |
| parent | 764355487ea220fdc2faf128d577d7f679b91f97 [diff] |
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: 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