]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Aug 2011 18:08:06 +0000 (11:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Aug 2011 18:08:06 +0000 (11:08 -0700)
commitd55140ce3a7b36241171bd78c75a5ee85de20439
tree427fe4fb647492333a91532952fb47d7c77bcc18
parentaf9d220bac41dc3201893e1601cc7c44f7da4498
parent764355487ea220fdc2faf128d577d7f679b91f97
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