From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 25 Oct 2013 06:32:01 +0000 (+0100)
Subject: Merge tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.12-rc7~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=88829dfe4b6ea0c1c24d415668b3bfa78e5a5b16;p=~emulex%2Finfiniband.git

Merge tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull ecryptfs fixes from Tyler Hicks:
 "Two important fixes
   - Fix long standing memory leak in the (rarely used) public key
     support
   - Fix large file corruption on 32 bit architectures"

* tag 'ecryptfs-3.12-rc7-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: fix 32 bit corruption issue
  ecryptfs: Fix memory leakage in keystore.c
---

88829dfe4b6ea0c1c24d415668b3bfa78e5a5b16