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

Merge commit 'v2.6.37-rc8' into x86/apic



Conflicts:
	arch/x86/include/asm/io_apic.h

Merge reason: move to a fresh -rc, resolve the conflict.

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