Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Loading
Please register or sign in to comment
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by:
Ingo Molnar <mingo@elte.hu>