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

Merge commit 'v2.6.26-rc8' into x86/xen 



Conflicts:

	arch/x86/xen/enlighten.c
	arch/x86/xen/mmu.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents a987b16c 543cf4cb
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