Merge remote-tracking branch 'stable/linux-3.11.y'

Conflicts:
	arch/arm/boot/compressed/atags_to_fdt.c
	arch/arm/boot/compressed/decompress.c
	arch/arm/boot/compressed/head.S
	arch/arm/include/asm/cputype.h
	arch/arm/include/asm/spinlock.h
	arch/arm/kernel/head-common.S
	arch/arm/kernel/head.S
	arch/arm/kernel/setup.c