Zram: accept up to 4 devices
Mach-exynos Hotplugging enable/disable
sys: Remove "Samsung Rooting Restriction Feature"

Conflicts:
	kernel/sys.c
Revert "sys: Remove "Samsung Rooting Restriction Feature""

This reverts commit 6db1abd11c7a7364b37ab58ccfe6896634b16178.
mmc: Add TriangleAway support
block: Optimize read speed of schedulers (cfq, deadline, sio, vr)

Conflicts:
	block/vr-iosched.c
Add j4fs support