From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jul 2015 21:18:10 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: omap-for-v4.3/fixes-merge-window~173
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4ec1f181f962f1cce3a61928d16e439e83882d1;p=pandora-kernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull key fix from James Morris.

Fix memory leak.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: ensure we free the assoc array edit if edit is valid
---

d4ec1f181f962f1cce3a61928d16e439e83882d1