modified:   Makefile
	modified:   arch/arm/configs/cm_rhine_honami_row_defconfig
	modified:   arch/arm/mach-msm/Kconfig
	deleted:    arch/arm/mach-msm/intelli_plug.c
	modified:   drivers/cpufreq/Kconfig
	modified:   drivers/cpufreq/Makefile
	deleted:    drivers/cpufreq/cpufreq_smartassH3.c

Change-Id: I68f257ef9090ab1ad73789c783d669b42d5a5b95
intelli_plug: clean port from faux's n5 kernel (squashed commits)

This is a combination of 21 commits.
The first commit's message is:

Revert previous intelli_plug porting attempt (squashed commits)

This is a combination of 3 commits
This is the first commit message:

Revert "intelliplug: dirty fix to allow build"

This reverts commit b5750e37dc3614f45e9078dd736b83cb47ca98b9.

This is the 2nd commit message:

Revert "intelliplug: update to latest version"

This reverts commit 550dc64ad8d83cde74d7c1634512f130220a1f91.

This is the 3rd commit message:

Revert "intelli_plug: intelligent hotplug cpu driver with eco mode"

This reverts commit 0a54f9cd26bb8ba6f9d9403c9e0c0a697975cfb5.

Conflicts:
	arch/arm/mach-msm/Kconfig

Change-Id: I6e18c9287dfaeabe91d5b4f5aab0cd09ffd5e6a2

Port intelli_plug hotplug driver from faux's n5 kernel (squashed commits)

This is a combination of 19 commits.
The first commit's message is:

intelli_plug: intelligent hotplug cpu driver with eco mode

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

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile

Change-Id: Idc3e94d1fdbb9076090b0e7c318c373f06c0c4fe

This is the 2nd commit message:

intelli_plug: tweak for faster wakeup from suspend

bump version to 1.1

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

This is the 3rd commit message:

intelli_plug: increase cores on persistence

also replace hardcoded values with Macros for ease of updating later

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

This is the 4th commit message:

intelli_plug: make it gcc-4.6.x eabi compatible :p

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

This is the 5th commit message:

intelli_plug: use rq_stats to help detect artificial or constant loads

benchmarks often create fake / artificial loads at a constant rate.  These
type of loads are not detected corectly by run average algorithms. Use
the run queue stats to help detect these cases and bring up the cores in
correspondence.

bump version to 1.2

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

This is the 6th commit message:

intelli_plug: use mp_decision() algorithm for core 3 and 4

This replaces the simplistic check for run queue thresholds with a more
sophisticate algorithm with time awareness

bump version to 1.3

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

This is the 7th commit message:

intelli_plug: tweak mp_decsion parameters and remove unused logic

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

This is the 8th commit message:

intelli_plug: bump threshold slightly for better response

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

This is the 9th commit message:

wip: intelli_plug: change logic for better benchmark performance

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

This is the 10th commit message:

intelli_plug: use mp_decision to reduce online persistence count for cores

this should bring down the cores faster when run queue is low
also optimized code a bit using local vars

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

This is the 11th commit message:

intelli_plug: disable by default

let the user enable via sysfs so it won't clash with mpdecision which is
enabled by default for qualcomm phones

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

This is the 12th commit message:

intelli_plug: slow down hotplug activity from 50ms to 200ms

this will reduce the hotplug chaos which may in turn save more power

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

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

This is the 13th commit message:

intelli_plug: code clean up and minor bug fixes

bump to version 1.6

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

This is the 14th commit message:

intelli_plug: add dynamic load sampling rate logic

Add dynamic sampling logic based on load. If load is high and required more
than 2 cores, increase the sampling rate for a duration of 3 seconds to help
manage the load better during this time.  Once duration expires, revert back
to lazier sampling rate for better batter performance.

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

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

Change-Id: I6890cc03b24fdd620dad4a746d0bde4e93619ac4

This is the 15th commit message:

intelli_plug: add new power_suspend PM driver

bump version to 1.9

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

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

Change-Id: Ia0aecd8c42c067d8b012152dd916b4e103548008

This is the 16th commit message:

intelli_plug: add touch input logic

changed intelli_plug sampling rates and bump to version 2.0

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

This is the 17th commit message:

intelli_plug: use a context safe function call instead

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

This is the 18th commit message:

intelli_plug: performance tune-up continued...

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

This is the 19th commit message:

intelli_plug: switch to use dedicated high priority workqueue

from the shared global workqueue.  This should prevent hang ups while the
global workqueue is busy and cleaned up some logic issues.

give input boost its own workqueue

bump to version 2.2

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

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/intelli_plug.c

	modified:   arch/arm/mach-msm/Kconfig
	new file:   arch/arm/mach-msm/intelli_plug.c
intelli_plug is OFF by default. + tuning
arch/arm/mach-msm/cpufreq: remove deprecated logic

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

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

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

	modified:   arch/arm/mach-msm/cpufreq.c

Change-Id: I6edefff7ed0db8801cec0d9fff8b2354ae75181e
Revert "arch/arm/mach-msm/cpufreq: remove deprecated logic"

This reverts commit 5116f7d0cfabf45d88645e8c8268c130b6057233.

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

	modified:   arch/arm/mach-msm/cpufreq.c

Change-Id: I1fb04200fa7da03fdfa39ad03f40943f852cc58f
Add support for single core eco-mode

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

Change-Id: I2c0db6e98768454e128314be0d1a647c406a3655
Intelli Hot Plug: merged tuning, and fixed running queue when OFF.

now cpu idle is OK, and no more ksoftirqd/0 on 20% without reason!

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

Change-Id: I79799895be5a2ede8e7ead1322cd98828f0d9180
Intelli HotPlug: Added tuning sysfs and tuned as was good for me.

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

Change-Id: I7051eb05ae482acfecead181ccaadabd2918c414
intelli_plug: fix some merge derps

Change-Id: Ieaa0ebc15cf5d54413dd99d1019927fb32286928
LCD_KCAL: Color Control driver for Moto G
LCD_KCAL: porting to Xperia Z1 (part 2)

Conflicts:
	arch/arm/mach-msm/board-8974.c

Change-Id: I6f7f1137fc3e274d5d60f0e5319ad3b7b813d79d

Conflicts:
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-8974.c
	drivers/video/msm/mdss/Kconfig

	modified:   arch/arm/mach-msm/board-8974.c
	modified:   drivers/video/msm/mdss/Kconfig
	modified:   drivers/video/msm/mdss/mdss_mdp_pp.c
Updated Intelliplug V3.X

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

	new file:   arch/arm/mach-msm/intelli_plug.c

Change-Id: Ic4f7f751d96c3c8484493b8734bee01c75f137fc

Conflicts:
	arch/arm/mach-msm/intelli_plug.c

	modified:   arch/arm/mach-msm/intelli_plug.c
Add CPUTime_Add and Sub!