From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Sep 2013 18:12:20 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: firefly_0821_release~176^2~5218
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b822cb187d6c62d6de0a7a8cfd7bd76234cecdd6;p=firefly-linux-kernel-4.4.55.git

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

Pull apparmor fixes from James Morris:
 "Bugfixes for the Apparmor code for regressions introduced in the 3.12
  pull request"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix suspicious RCU usage warning in policy.c/policy.h
  apparmor: Use shash crypto API interface for profile hashes
---

b822cb187d6c62d6de0a7a8cfd7bd76234cecdd6