+2
−2
Documentation/arm/tcm.txt
0 → 100644
+147
−0
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts:
kernel/trace/trace_event_profile.c
Merge reason: update to -rc5 and resolve conflict.
Signed-off-by:
Ingo Molnar <mingo@elte.hu>