From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Sep 2013 02:17:04 +0000 (-0700)
Subject: Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc1~49
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ae276a9113305fb74c54f8df72da3ba2d559e60;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git./linux/kernel/git/tyhicks/ecryptfs

Pull eCryptfs fixes from Tyler Hicks:
 "Two small fixes to the code that initializes the per-file crypto
  contexts"

* tag 'ecryptfs-3.12-rc1-crypt-ctx' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  ecryptfs: avoid ctx initialization race
  ecryptfs: remove check for if an array is NULL
---

1ae276a9113305fb74c54f8df72da3ba2d559e60