Skip to content
Commit f6dc8cca authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/generic-dma-coherent



Conflicts:

	kernel/Makefile

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 323ec001 5b664cb2
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment