]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb254f3 bfc5e3a)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Dec 2016 18:03:52 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 22 Dec 2016 18:03:52 +0000 (10:03 -0800)
commit67327145c4af673d9c4ef06537ca8c5818f97668
treec9c6365008efaaec6dd0fcf710c0c2de332878d8tree | snapshot
parenteb254f323bd50ab7e3cc385f2fc641a595cc8b37commit | diff
parentbfc5e3a6af397dcf9c99a6c1872458e7867c4680commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull SElinux fix from James Morris:
 "From Paul:
   'A small SELinux patch to fix some clang/llvm compiler warnings and
    ensure the tools under scripts work well in the face of kernel
    changes'"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: use the kernel headers when building scripts/selinux
Linux kernel for KaRo TX COM modules