Memcontrol and swap update fro 3.2.46 (kylon)

Conflicts:
	arch/arm/configs/sense3.6_defconfig
	mm/memcontrol.c