From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Nov 2011 09:14:30 +0000 (-0200)
Subject: Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
X-Git-Tag: v3.2-rc3~42
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e36d5058dbf85aacf2fadf508f275afd37c58576;p=users%2Fhch%2Fblock.git

Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security

* 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security:
  encrypted-keys: module build fixes
  encrypted-keys: fix error return code
  Smack: smackfs cipso seq read repair
---

e36d5058dbf85aacf2fadf508f275afd37c58576