Revert "staging: prima: add option to read calibration data from HTC NVS"

This reverts commit 168042f1e21854b9b98832de884b0427b230439f.

Change-Id: I2fbac3af1695b0025a5063027062f42424820476
Revert "cpuidle: make a single register function for all"

This reverts commit ca93f4c256b7814344fcfcb0b59d3a0255ca3908.
Revert "cpuidle: remove the power_specified field in the driver"

This reverts commit cb6396447ff9055933804a2f943c3d0ebea89d07.
Revert "cpuidle: Fix finding state with min power_usage"

This reverts commit ce01c6dc3556438d2c24081517b282e497c42368.
Revert "cpuidle: Get typical recent sleep interval"

This reverts commit 28d2cdec7e38bd93c0ac84558966d48b332e603a.
Revert "cpuidle: Quickly notice prediction failure in general case"

This reverts commit 4ebe622f155a960c47d38861af22f7f806cf96bd.
Revert "cpuidle: Quickly notice prediction failure for repeat mode"

This reverts commit 35cba99661853abcea7a7349ffdbfbc614ab948f.
Revert "cpuidle: move field disable from per-driver to per-cpu"

This reverts commit f0c98f7f4e06dee10374032b3c100a4844bf20e6.
Revert "cpuidle: coupled: fix sleeping while atomic in cpu notifier"

This reverts commit 0fc5dfe17c89b8a0e961f0f819a664750a870464.
Revert "cpuidle: coupled: add parallel barrier function"

This reverts commit af5a126f32b16a80d12a416d4b8b4c774b83aef6.
Revert "cpuidle: add support for states that affect multiple cpus"

This reverts commit b3adc5cc46f0ed424cf4d0f8119d0c3851c2d4ce.
Revert "cpuidle: fix error handling in __cpuidle_register_device"

This reverts commit 4f63ba4b66608c2ab520ba2daa3ce7b5bcfd788f.
Revert "cpuidle: refactor out cpuidle_enter_state"

This reverts commit 6f69e96fa78f07f54aec5a4c88d9e07882741644.
msm: HTC: elite: Make private members static

Change-Id: I71592e880cd38c6913bdcbb0cfa85d427c2f8158
Revert "ville: Split display on code"

This reverts commit 306d6cd2dc110575871969baf7145ed5fc73d7f4.

Change-Id: I0150e426010cf13287727b90bfcc31e0592caf61
input: touchscreen: synaptics_3k kconfig: skip fw condition timeout

Add an option to skip the fw condition timeout.

Change-Id: I4e25bc48dc7eed87799aa1bd6843a6540753e541
msm: HTC: fighter: disable synaptics ts fw timeout

This firmware timeout causes touchscreen to often not work in recovery.

Change-Id: I72a95130aa3591627b1282f3ad0ab351a26bf032
input: r3gd20: Update R3GD20 gyroscope driver

* HTC kernel version: m7stock_3.4.10-g1a25406

Change-Id: I476a98a6ce1491ac871698f53387f37b14b57210
input: mpu3050: Update HTC version of MPU3050 sensor

* HTC kernel version: m7stock_3.4.10-g1a25406

Change-Id: I0c961cb03a7a1d90fe1f3bfc2a3568cc63819049
misc: rt5501: Update HTC RT5501 Amp driver

* HTC kernel version: m7stock_3.4.10-g1a25406

Change-Id: Id1171458ba767facc0473ad303ee9bfaacad926f