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
Merge branch 'cm-11.0' into kk_mkt