Merge in MJ5

Conflicts:

	arch/arm/configs/chronic_jf_defconfig
	build_master.sh
	drivers/gpu/msm/Kconfig
	drivers/net/usb/rmnet_usb_ctrl.c

Change-Id: Id9a06448971d9dbd42ffba863f3a06becc039736
msm: mdm2: Add delay between subsequent PS_HOLD for 8064 fusion3

This feature was previously added for the 8960 sglte target,
in commit 21274cf2219899ef9b46cf8b9fd8bf4ce52d057b, but it also
applies to the 8064 sglte2 target. The original commit message
follows.

During SSR first a reset of external modem is issued
and mdm_do_soft_power_on() toggles ap2mdm_soft_reset which
in turn toogles the PS_HOLD. Then a part of SSR external
modem is powered up and mdm_do_soft_power_on() again toggles
the gpio. For PMIC register stabilization we need a 1sec delay
between subsequent mdm_do_soft_power_on().
By default the delay is 500msec, so adding another 500msec for
stablization.

Signed-off-by: Joel King <joelking@codeaurora.org>

Conflicts:
	arch/arm/mach-msm/board-8064.c

Change-Id: I8ac22d94205cb309dd5ba4b1f3a20933632298db