Sound Control: fix copy and paste error for separate record lock

Signed-off-by: Paul Reioux <reioux@gmail.com>
Sound Control: add line gain to cached and register lock

bump version to 3.6

Signed-off-by: Paul Reioux <reioux@gmail.com>
Revert "thermal: tsens8960: Increase the polling rate"

This reverts commit bf0caef085043aa0155a97c5d29ea53c471beb1b.
Revert "msm_thermal: Import driver from jb422 branch"

This reverts commit 361676bc46f5bc40c388e9488b4587a3411d1a50.
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
intelli-thermal: fix stats calculations

Signed-off-by: Paul Reioux <reioux@gmail.com>
intelli-thermal: use its own dedicated workqueue

this should reduce the load on the shared global workqueue for other
processes and also give its own unique variable name for cpu limit

Signed-off-by: Paul Reioux <reioux@gmail.com>
intelli-thermal: increase sampling time to reduce sampling overhead

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

Conflicts:
	drivers/thermal/intelli/msm_thermal.c
drivers/thermal/Kconfig: fix default prompt error

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