Merge branch 'zram' into cm-11.0

Change-Id: Ie22e0bdc2757927253bb3309c1f067e4a1adc5be
Signed-off-by: Randy DuCharme <radio.ad5gb@gmail.com>

Conflicts:
	arch/arm/mach-msm/devices-8930.c
	drivers/video/msm/mdp4_overlay.c
	include/linux/swap.h
	mm/page_io.c
	mm/swapfile.c