From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Sep 2015 01:44:28 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... 
X-Git-Tag: firefly_0821_release~176^2~1173
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=45c680b9949ecdb829a331100ae49926bf82899c;p=firefly-linux-kernel-4.4.55.git

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

45c680b9949ecdb829a331100ae49926bf82899c