From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Feb 2014 02:14:53 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v3.14-rc2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd63204c55a207873eee1e8e225bccc9ae27d949;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus' of git://git./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
---

cd63204c55a207873eee1e8e225bccc9ae27d949