orvalds <torvalds@linux-foundation.org> 1321607670 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1321607670 -0200

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
�����