projects / sdk / emulator / emulator-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f94aa7c f743166)
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)
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


Trivial merge
Domain: SDK / Emulator;