etc

Conflicts:

	drivers/usb/host/ehci-msm-hsic.c