]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e61baed ea631f6)
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)
* '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


Trivial merge
Linux Kernel Source Tree.