Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 08:00:29 +0000 (17:00 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 08:00:29 +0000 (17:00 +0900)
commit550ad8ef390cbd4c2efc7a8e398add2e753abe7e
tree78c6e9fddeb227f59d2755a23e325f42b544fc0a
parenta090bd4ff8387c409732a8e059fbf264ea0bdd56
parent023f108dcc187e34ef864bf10ed966cf25e14e2a
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()