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

Merge commit 'v2.6.27-rc3' into x86/prototypes



Conflicts:

	include/asm-x86/dma-mapping.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents b2139aa0 30a2f3c6
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