From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Dec 2014 17:52:49 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: firefly_0821_release~176^2~2650
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=5f5425ef55b3fd2d395fb917edde3e6ae438c29a;p=firefly-linux-kernel-4.4.55.git

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

Pull security subsystem fixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: remove a bogus NULL check
  ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met
  KEYS: Fix stale key registration at error path
---

5f5425ef55b3fd2d395fb917edde3e6ae438c29a