tree 542e78181dcd7ac022fb581942e284fce2c895cd
parent 319645cac26c2d065a485f5d59228433ad602f71
parent e41b104c7dba92443e594e6bc86e4b0bf1cdf573
author Linus Torvalds <torvalds@linux-foundation.org> 1447964172 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1447964172 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching

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