Revert "ancora: Give extra 1 mb into ion_sf heap"

This reverts commit 696dfa24816473a41099996329c11045a328b247.
Revert "devices-msm7x30: #ifdef around msm_nand device"

This reverts commit 90f7edfab7683702b77656b45fc19f4135d4a68d.
cpufreq: SmartAssV2 CPU governor

A smart optimized governor based on OnDemand

Conflicts:
	drivers/cpufreq/Kconfig
	drivers/cpufreq/Makefile
	include/linux/cpufreq.h
block: Simple I/O scheduler

The Simple I/O scheduler is an extremely simple scheduler,
based on noop and deadline, that relies on deadlines to
ensure fairness. The algorithm does not do any sorting but
basic merging, trying to keep a minimum overhead. It is aimed
mainly for aleatory access devices (eg: flash devices).

Conflicts:
	block/Kconfig.iosched
update defconfig
Merge branch 'cm-11.0' of https://github.com/device-ancora/samsung-kernel-msm7x30 into cm-11.0