From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Apr 2012 03:16:02 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: firefly_0821_release~3680^2~3047
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=932e9f352b5d685725076f21b237f7c7d804b29c;p=firefly-linux-kernel-4.4.55.git

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: fix compile error in commoncap.c
---

932e9f352b5d685725076f21b237f7c7d804b29c