tree 961d7f9360194421a71aa644a9d0c176a960ce49
parent 9982fbface82893e77d211fbabfbd229da6bdde6
parent 63cf13b77ab785e87c867defa8545e6d4a989774
author Ingo Molnar <mingo@elte.hu> 1216160947 +0200
committer Ingo Molnar <mingo@elte.hu> 1216160947 +0200

Merge branch 'linus' into cpus4096

Conflicts:

	arch/x86/xen/smp.c
	kernel/sched_rt.c
	net/iucv/iucv.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>