msm_fb: display: set HTC width and height panel parameters

Change-Id: I8a802b95fed1acc635c5a59fb6be91b98eec5823
m4: fix post m7 commit merge

Change-Id: I79595d7c8605638f52e48bd60ca8bcb1d8dd9985
Revert mass USB commit, add m4 merge fixes

This reverts commit 394af222cde9a017642fdd3898a052717ff88c60.

Conflicts:
	arch/arm/mach-msm/mdm_common.c
	drivers/char/diag/diagfwd_hsic.c
	drivers/usb/core/driver.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/host/ehci-msm-hsic.c
	drivers/usb/otg/Makefile
	drivers/usb/otg/msm_otg.c
	drivers/usb/otg/msm_otg_htc.c
	include/linux/usb/msm_hsusb.h

Change-Id: Ia5a82a8aca793643929c50148e433634b67887b2
USB: gadget: remove f_projector code.

Change-Id: I9569dba4d1916e26ef17a678457bf4b07f14a1cb
msm8930: m4: cleanup more merge mess

Change-Id: I113e2d1ba8d0db189da20eb3a78fc0d35789e2c2