mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts: include/linux/slub_def.h lib/Kconfig.debug mm/slob.c mm/slub.c
This commit is contained in:
commit
8302294f43
149 changed files with 14718 additions and 3785 deletions
1
include/asm-m32r/ftrace.h
Normal file
1
include/asm-m32r/ftrace.h
Normal file
|
|
@ -0,0 +1 @@
|
|||
/* empty */
|
||||
Loading…
Reference in a new issue