From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v3.1-rc2~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d55140ce3a7b36241171bd78c75a5ee85de20439;p=~emulex%2Finfiniband.git

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
---

d55140ce3a7b36241171bd78c75a5ee85de20439