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)
commit45c680b9949ecdb829a331100ae49926bf82899c
tree21b8267a41fa49423657726b56f314fa8c6b6506
parent851328feb8c1d4130d3a0acb004e474168702d6d
parent225f58fbcc02ace232fc49f05036042f9d58263e
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/livepatching

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()