Merge Linux 3.4.83 into cm-11.0

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

Change-Id: I1d06a049497ce5cc994f8548f1f78a22b0b3f975