Merge branch 'topic/livepatch' of git://git.kernel.org/pub/scm/linux/kernel/git/power...

Pull livepatching support for ppc64 architecture from Michael Ellerman.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/kernel/module_64.c
Simple merge

diff --cc arch/powerpc/kernel/process.c
Simple merge

diff --cc arch/powerpc/kernel/setup_64.c
Simple merge

diff --cc include/linux/ftrace.h
Simple merge

diff --cc kernel/livepatch/core.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge