]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite4d9da530a35981aeff6ddecda7bdcaa30a1aa07
tree35f2525f2666b272028ed0e956d43d547581eeb6
parente61baed3b379606b6966e1d7e9e2ee8444e1441d
parentea631f66dc8875932af6321ba3efa6353f328c32
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