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

Merge branch 'linus' into core/iommu 

Conflicts:
	arch/ia64/include/asm/dma-mapping.h
	arch/ia64/include/asm/machvec.h
	arch/ia64/include/asm/machvec_sn2.h
parents 961d7d0e 7cb36b6c
Expand all 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