power: pm8921: M4 uses lpm_wrkarnd as well

Change-Id: Ifc86e0612c0af3f2cca2e401f75f52f324075d99

Conflicts:
	drivers/power/pm8921-charger-htc.c
Merge remote-tracking branch 'codeaurora/caf/kk_2.7_rb1.40' into cm-11.0

Conflicts:
	drivers/media/video/msm/csi/msm_ispif.c
	drivers/media/video/msm/msm_mctl_pp.c

Change-Id: Iedfd6dc3e8dea93df993e0b043ab5eee55784a12
msm: HTC: Add support for SPI GSBI1

Change-Id: I7fa11c00539c453be0544f0ab417cfac2ca9e36d
msm: HTC: Add support for I2C GSBI7

Change-Id: Id15bb10239aaff490f2e7678ab4347c8fe93ac41
msm: HTC: Add T6 camera clock entry

Change-Id: Ifc29dd100b9a4d51b0de388b9ca9dc1dead05f79
input: lsm330: Add LSM330 gyroscope/accelerometer driver

* HTC kernel version: t6ul-3.4.10-g0534bc3

Change-Id: I48f84208bdcd2f44eedd87da05b4d07ad33a9ff9
input: touchscreen: max1187x: Import max1187x driver for T6

* HTC package version: t6ul-3.4.10-g0534bc3

Change-Id: I931d5484a8c8d05ef2ac329983e8318028f2d6fe
misc: fpr: Add HTC Vadality fingerprint driver

* HTC kernel version: t6ul-3.4.10-g0534bc3

Change-Id: Icaf0c4745bb59b3cfb288d88b872973aaa6946a1
msm: HTC: Add T6 panel IDs

Change-Id: Ib92024e51a08624ffe49e6e7a32e32f8bc6e0b43
msm: HTC: T6: Import T6 board files

* Add support for HTC T6 (HTC One Max)

Change-Id: Id751dd0e23db408ad5cdb3b50028a296093a7038

Conflicts:
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/htc/Kconfig.board
	arch/arm/mach-msm/htc/Makefile.board
	drivers/power/pm8921-charger-htc.c
	include/linux/mfd/pm8xxx/pm8921-bms-htc.h
	sound/soc/msm/msm-compr-q6.c
staging: prima: Add v3.2.1.11h Prima WLAN driver

Change-Id: I65853f302d72b2e017759123142112b4f002ec0f
Revert "power: pm8921: M4 uses lpm_wrkarnd as well"

This reverts commit 94d6796a18ca00a3b79c18b4fd4b04e15554ac47.

Conflicts:

	drivers/power/pm8921-charger-htc.c
power: pm8921: M4 uses lpm_wrkarnd as well

Change-Id: Ifc86e0612c0af3f2cca2e401f75f52f324075d99

Conflicts:

	drivers/power/pm8921-charger-htc.c
Revert "valentewx: Split display on code"