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

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



Conflicts:

	arch/x86/Kconfig

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents b6d4f7e3 f934fb19
Hide whitespace changes
Inline Side-by-side
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