Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
arch/x86/Kconfig
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:
arch/x86/Kconfig
Signed-off-by:
Ingo Molnar <mingo@elte.hu>