]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 319645c e41b104)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livep...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2015 20:16:12 +0000 (12:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 19 Nov 2015 20:16:12 +0000 (12:16 -0800)
Pull livepatching fix from Jiri Kosina:
 "A fix for module handling in case kASLR has been enabled, from Zhou
  Chengming"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
  livepatch: x86: fix relocation computation with kASLR


Trivial merge
Linux kernel for KaRo TX COM modules