msm: HTC: m7: ifdef for synaptics touchscreen

Change-Id: I55ba2386abde3f8237af1007bdd58bc9b771aeed
ip_gre: remove duplicate pointer definition

*neigh is defined twice here and will cause the build to fail if
this code is used

Change-Id: I23a6d1e31b96a47f143d0c5c44558cddfc632b06
msm: HTC: m7: enable CMD_CLK_CTRL for display on

* Address errant MIPI DMA timeout on panel on

Change-Id: I00edb1ded4cd792c6291a2df9421bf7966acac94
msm: HTC: m7: initialize clk_ctrl variable

Change-Id: Ie2cbd1dc97b1d3be4c79048061ae86464471076a
misc: Remove psensor, pocket mode code

Change-Id: Iaccfbd8c2da202dfabf4e947389bcfb82b4a8b13
msm: HTC: battery_8960: don't schedule update on suspend/resume

* This is being scheduled on both early suspend and late resume. Don't
  do this here.

Change-Id: I1ded619cb6f8d6e4f52682e4b6ffb048537151d2
msm: HTC: m7: Remove unnecessary usleep

Change-Id: I1277e5315fb58c9b8f04c3ae72490cd4cbd0e08e
msm: HTC: m7: Remove suspend/resume LPM function logging

* Unnecessarily noisy

Change-Id: I1dcb964c2f17554e5af8a4ee36ee55ae53bb9cb1
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of github.com:Team-Hydra/android_kernel_htc_msm8960 into cm-11.0