FS: import F2FS

Signed-off-by: Paul Reioux <reioux@gmail.com>
f2fs: data: AIO optimization compatibility fixup

Signed-off-by: Paul Reioux <reioux@gmail.com>
mm: Added filesystem dynamic read-ahead (Credits to Chad Gooldman)
intelli/msm_thermal: initial coding for Qualcomm S4 Pro devices

an intelligent MSM thermal throttling kernel driver designed to replace the
closed sourced thermald(aemon) from Qualcomm.

The current driver can throttle the SOC via core frequency scaling or via
core hotplug with user configurable sysfs entries to adjust the throttling
temperature thresholds for each.

Derived from Qualcomm's Open source repo.

Signed-off-by: Paul Reioux <reioux@gmail.com>

Conflicts:
	arch/arm/mach-msm/lge/mako/board-mako.c
	include/linux/msm_thermal.h
intelli-thermal: fix stats calculations

Signed-off-by: Paul Reioux <reioux@gmail.com>
MPDEC: add mp decision by @showp1984
Voltage Control: add sysfs interface
Signed-off-by: faux123 <reioux@gmail.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
voltage_control: initial voltage control for 8960 krait
based on the voltage control patch for s4 pro socs by @faux123

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/acpuclock-8960.c

Conflicts:
	arch/arm/configs/torched_elite_defconfig
	arch/arm/mach-msm/Kconfig
Vmin(): create new bypass config to disable vmin without disabling voltage control

Conflicts:
	arch/arm/configs/torched_elite_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/acpuclock-krait.c
CPU OC: Initial support for 1.7ghz OC

Conflicts:
	arch/arm/configs/torched_elite_defconfig
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/acpuclock-krait.c
GPU oc

Conflicts:
	arch/arm/configs/torched_elite_defconfig
	arch/arm/mach-msm/Kconfig

Conflicts:
	arch/arm/mach-msm/devices-8960.c