tree 35f2525f2666b272028ed0e956d43d547581eeb6
parent a9098b372606a15745cdeb012de4ee91c0df82c4
parent b85c804d5ad48f239871b95afbddd84422e06f25
author Linus Torvalds <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