Linux 3.4.5

Conflicts:
	arch/x86/kernel/cpu/scattered.c