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)
commit6960d58240190a885c09e784b8dcc1345951a7c8
tree1a75bf1f7fd4c04712c3a7c7dd8a0285b044ac3e
parentf39fdf2ab846ecc636d6272b47f28a05a2052a14
parent59024954a1e7e26b62680e1f2b5725249a6c09f7
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/livepatching

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