Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Feb 2017 17:59:45 +0000 (09:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Feb 2017 17:59:45 +0000 (09:59 -0800)
commitd3498fbaf386f9d540cdde7211ebb2d502b2b365
treedf7cf98c566236986b6cc6f3ca4b95ee14e858a6
parent23fbe2cdc1de80120cf9ccd478ac57c3a3a0764b
parent0c461cb727d146c9ef2d3e86214f498b78b7d125
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull selinux fix from James Morris:
 "Fix off-by-one in setprocattr"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  selinux: fix off-by-one in setprocattr