Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Aug 2015 01:18:22 +0000 (18:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Aug 2015 01:18:22 +0000 (18:18 -0700)
Pull LSM regression fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  LSM: restore certain default error codes


Trivial merge