Linux 3.4.83

Conflicts:
	arch/arm/mm/proc-v7.S
	mm/memory_hotplug.c