From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jun 2017 08:00:29 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: android-x86-8.1-r1~3375
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=550ad8ef390cbd4c2efc7a8e398add2e753abe7e;p=android-x86%2Fkernel.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull selinux fix from James Morris:
 "Fix for a double free bug in SELinux"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: fix double free in selinux_parse_opts_str()
---

550ad8ef390cbd4c2efc7a8e398add2e753abe7e