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)
commitcd63204c55a207873eee1e8e225bccc9ae27d949
treecf5fa6ad8839a62cbc82e64e578d0ff7f05928d2
parentf94aa7c7f1fc474be776e4bf88088d5a007d3575
parentf743166da7e93b617dd93120cdb5edcc8b84c464
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