Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 03:56:09 +0000 (20:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2016 03:56:09 +0000 (20:56 -0700)
commitcc23c619f8da3ccbe6a856c79fb5a3d245b68daf
treee0f8000cc390e1744e823a5b04ed0f593210fb79
parent7ed18e2d1b6782989eb399ef79a8cc1a1b583b3c
parent30a46a4647fd1df9cf52e43bf467f0d9265096ca
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull apparmor fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix oops, validate buffer size in apparmor_setprocattr()