+2
−2
Documentation/ABI/testing/debugfs-ec
0 → 100644
+20
−0
Documentation/ABI/testing/debugfs-kmemtrace
deleted100644 → 0
+0
−71
+21
−0
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by:
Ingo Molnar <mingo@elte.hu>