From: Linus Torvalds Date: Wed, 14 Dec 2016 19:10:32 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep... X-Git-Tag: v4.10-rc1~123 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=6960d58240190a885c09e784b8dcc1345951a7c8;p=karo-tx-linux.git Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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 --- 6960d58240190a885c09e784b8dcc1345951a7c8