Merge branch 'linus' into core/generic-dma-coherent
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Please register or sign in to comment
Conflicts:
kernel/Makefile
Signed-off-by: Ingo Molnar <mingo@elte.hu>