Merge branch 'linus' into perf/urgent, to resolve conflict
Conflicts:
arch/powerpc/configs/85xx/kmp204x_defconfig
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
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/powerpc/configs/85xx/kmp204x_defconfig
Signed-off-by:
Ingo Molnar <mingo@kernel.org>