Conflicts:
	arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>