]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7d75c4f 780ee28)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Feb 2014 02:14:53 +0000 (18:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Feb 2014 02:14:53 +0000 (18:14 -0800)
commit20d8d7cbae0294a19fc9a0bee6469098a745954f
treecf5fa6ad8839a62cbc82e64e578d0ff7f05928d2tree | snapshot
parent7d75c4f204d433170ca485443de1f9a898d246e7commit | diff
parent780ee284222548fb9c07e4a1eaaadb537bba06b3commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull SELinux fixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  SELinux:  Fix kernel BUG on empty security contexts.
  selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types
Linux Kernel Source Tree.