squashed set of LZ4 reverts
Merge branch 'cm-10.1-wip' of git://github.com/Mustaavalkosta/htc7x30-3.0 into rs-dev

Conflicts:
	drivers/staging/zcache/zcache-main.c
	drivers/staging/zram/zram_drv.c