]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit33b4d112463c24a9969b1078c1284e88901b453a
treec9c6365008efaaec6dd0fcf710c0c2de332878d8
parent5d174949d98fa9be936f09e71561d5764a663032
parent68c3ed4a95767e1b06f4b3b32de2b8b4f45a205d
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