-
由 Ingo Molnar 提交于
Conflicts: kernel/trace/trace_event_profile.c Merge reason: update to -rc5 and resolve conflict. Signed-off-by: NIngo Molnar <mingo@elte.hu>
bb3c3e80
Conflicts:
kernel/trace/trace_event_profile.c
Merge reason: update to -rc5 and resolve conflict.
Signed-off-by: NIngo Molnar <mingo@elte.hu>