From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Sep 2014 16:24:46 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v3.17-rc5~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96ea975bfeec855d119bb93df885d7f18452856a;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

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

Pull assoc array garbage collection fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Fix termination condition in assoc array garbage collection
---

96ea975bfeec855d119bb93df885d7f18452856a