Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c
Signed-off-by: NIngo Molnar <mingo@elte.hu>