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)
commitf5db4b31b31504a1058339bc00488bf56ad1f0aa
tree7c9a5497f81183fa06100b7535cb6202d8a797f6
parentf045fd755fe9ba2b15265cd237d6ae5d924689d3
parente308fd3bb2e469c4939d3f4bd22b468de3ed04ae
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

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