Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-security
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Nov 2011 09:14:30 +0000 (07:14 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Nov 2011 09:14:30 +0000 (07:14 -0200)
commite36d5058dbf85aacf2fadf508f275afd37c58576
tree35f2525f2666b272028ed0e956d43d547581eeb6
parenta9098b372606a15745cdeb012de4ee91c0df82c4
parentb85c804d5ad48f239871b95afbddd84422e06f25
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