]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3ba5c2a de2c25b)
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)
commit78e69a1eb4a85c346b38612b392934af5e0351ff
treecf5fa6ad8839a62cbc82e64e578d0ff7f05928d2tree | snapshot
parent3ba5c2a9e1b571de9f1c382dea20b8bdd732506ccommit | diff
parentde2c25bed80326f55fa8363e9c1c3e72bf4d89c1commit | 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.