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

This reverts commit 168042f1e21854b9b98832de884b0427b230439f.

Change-Id: I2fbac3af1695b0025a5063027062f42424820476
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
msm: HTC: Update HTC battery drivers

* HTC kernel version: m7stock_3.4.10-g1a25406

Change-Id: Ie615dcddb055df1a13c244b37cb024e2f2bfb8fc
msm: HTC: Update HTC device board files for battery updates

Change-Id: I927c6bc65e7d9a37b76a05fcb0d87050e53f4f01
power: pm8921: Update HTC pm8921 drivers

* HTC kernel version: m7stock_3.4.10-g1a25406

Change-Id: I5b35f54a48b051b7f3b03f0d867b9d14d9ddf8a2
USB: msm_otg: Update HTC variant of msm_otg

HTC kernel version: m7stock_3.4.10-g1a25406

Change-Id: I2707390c287a6d2a9f05814aea25362347240048
usb: Remove CONFIG_USB_OTG_HOST

* Set the correct behavior for HTC's driver, and turn these options off
  for 8960s. They cause some nasty side effects on XHCI systems.

Change-Id: I5d0e8ceaadd2cf4d90bfef420a144e07eae39f76
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0