diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 11:08:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 11:08:06 -0700 |
| commit | d55140ce3a7b36241171bd78c75a5ee85de20439 (patch) | |
| tree | 427fe4fb647492333a91532952fb47d7c77bcc18 /init | |
| parent | af9d220bac41dc3201893e1601cc7c44f7da4498 (diff) | |
| parent | 764355487ea220fdc2faf128d577d7f679b91f97 (diff) | |
| download | linux-3.10-d55140ce3a7b36241171bd78c75a5ee85de20439.tar.gz linux-3.10-d55140ce3a7b36241171bd78c75a5ee85de20439.tar.bz2 linux-3.10-d55140ce3a7b36241171bd78c75a5ee85de20439.zip | |
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
Diffstat (limited to 'init')
0 files changed, 0 insertions, 0 deletions