Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Sep 2015 01:44:28 +0000 (18:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 2 Sep 2015 01:44:28 +0000 (18:44 -0700)
Pull livepatching fix from Jiri Kosina:
 "Livepatching error handling fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: Improve error handling in klp_disable_func()


Trivial merge