Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Dec 2016 19:10:32 +0000 (11:10 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Dec 2016 19:10:32 +0000 (11:10 -0800)
Pull livepatch update from Jiri Kosina:
 "This is just a small documentation update (as the work on the hybrid
  model is still underway)"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  Documentation/livepatch: Fix stale link to gmame


Trivial merge