mako: regulator: adjust min/max vdd limits
msm: krait: added userspace voltage control

Conflicts:
	drivers/cpufreq/cpufreq.c

Conflicts:
	drivers/cpufreq/cpufreq.c
msm: krait: extend voltage control range
msm: acpuclock-krait: Disable vdd core boost
msm: krait: fixed voltages userspace interface
input: touchscreen: export accuracy filter items to userspace via sysfs

LG/mako touchscreen
mach: msm: msm_mpdecision: added enhanced hotplug governor from bricked kernel

Conflicts:
	arch/arm/mach-msm/Makefile
cpuinit: get rid of __cpuinit, first regexp
This commit is the result of:

find -name "*.c" | xargs sed -i "s/ __cpuinit / /g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>

Conflicts:
	arch/arm/mach-msm/acpuclock-krait.c

Conflicts:
	arch/arm/kernel/arch_timer.c
	arch/arm/kernel/smp.c
	arch/arm/mach-msm/acpuclock-krait.c
	kernel/workqueue.c
cpuinit: get rid of __cpuinit, second regexp
This commit is the result of:

find -name "*.c" | xargs sed -i "s/ __cpuexit / /g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
cpuinit: get rid of __cpuinit, third regexp
This commit is the result of:

find -name "*.c" | xargs sed -i "s/ __cpuinitdata//g"

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
msm: acpuclock-8x60: remove static from acpuclk_8x60_get_rate
msm: dcvs: remove no longer existing trace events

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
msm: rq_stats: add mpd rq_stats info function
mach-msm/cpufreq: set safe frequencies from config

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

Conflicts:
	arch/arm/mach-msm/cpufreq.c
msm thermal: enhancements

1) Smart polling based on temp (poll slower when cooler, faster when
warmer).

2) Added low frequency index so we don't throttle too low and kill
performance. When warming normally (throttle temp is reached) it will
step down by the freq_step until back under control. The lowest
frequency step possible is the specified by the low freq index.

3) Added throttle max (hardcoded at 80C). If it reaches the
throttle max, it will immediately throttle down to the min_freq_index
instead of stepping down 2 frequency steps at a time like when it hits
the throttle temp.

4) Added tuneables

/sys/module/msm_thermal/parameters/throttle_temp
/sys/module/msm_thermal/parameters/min_freq_index
/sys/module/msm_thermal/parameters/thermal_debug
driver: thermal: +10 over default settings
msm: thermal: add msm_thermal from bricked kernel
mach-msm: mpdecision: set min cpus online to 2
Revert "mach-msm: mpdecision: set min cpus online to 2"

This reverts commit 2ede97cab9e841d4a16f350ae670c42990707412.
msm: makefile: we don't need these in mako

Signed-off-by: Stratos Karafotis <stratosk@semaphore.gr>