mirror of
https://github.com/torvalds/linux.git
synced 2024-10-27 07:16:27 +00:00
c1ab9cab75
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit
|
||
---|---|---|
.. | ||
events | ||
boot.h | ||
define_trace.h | ||
ftrace.h | ||
syscall.h |