diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 05:46:32 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-18 05:46:32 +0100 |
commit | 0f49fc95b86fc77b867d643e2d38bc9f28035ed4 (patch) | |
tree | cdc6297fe95893905d7192df1e7dfb877517eead /arch/arm/mach-pxa/raumfeld.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik... (diff) | |
parent | livepatch/module: remove livepatch module notifier (diff) | |
download | linux-0f49fc95b86fc77b867d643e2d38bc9f28035ed4.tar.xz linux-0f49fc95b86fc77b867d643e2d38bc9f28035ed4.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching update from Jiri Kosina:
- cleanup of module notifiers; this depends on a module.c cleanup which
has been acked by Rusty; from Jessica Yu
- small assorted fixes and MAINTAINERS update
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
livepatch/module: remove livepatch module notifier
modules: split part of complete_formation() into prepare_coming_module()
livepatch: Update maintainers
livepatch: Fix the error message about unresolvable ambiguity
klp: remove CONFIG_LIVEPATCH dependency from klp headers
klp: remove superfluous errors in asm/livepatch.h
Diffstat (limited to 'arch/arm/mach-pxa/raumfeld.c')
0 files changed, 0 insertions, 0 deletions