7bcc18
parent af9d220bac41dc3201893e1601cc7c44f7da4498
parent 764355487ea220fdc2faf128d577d7f679b91f97
author Linus Torvalds <torvalds@linux-foundation.org> 1312999686 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1312999686 -0700

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
¨