Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts: arch/x86/include/asm/pgtable.h
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: arch/x86/include/asm/pgtable.h