Revert "Block and ROW improvements"

This reverts commit 90ea5ddc0f98ebbdcfd59301a5f4e4371e5a8f67.
Merge branch 'jb-4.2.1' of git://github.com/ts1506/samsung-kernel-aries into jb-4.2.1