]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d4056a 75331a5)
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jul 2012 17:39:40 +0000 (10:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jul 2012 17:39:40 +0000 (10:39 -0700)
commit3bfd245476eca2f8375249f3a1e7a60d3c754f47
tree09f0b3e3bfec1d19c7313d49749422b6c8ffdf7ctree | snapshot
parent9d4056aa9efa07015aa6da11ae2e72f22dc55c97commit | diff
parent75331a597cf4cde51d9b0bb22cbd03b9837ef9e4commit | diff
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security layer fixes from James Morris.

A documentation update, and a nommu build fix.

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: Fix nommu build.
  security: document no_new_privs
Linux kernel for KaRo TX COM modules