msm: mdm2: Fix sysmon.h include path.

sysmon.h is present in arch/arm/mach-msm directory.

Fixes following compilation error:
arch/arm/mach-msm/include/mach/mdm2.h:15:20:
fatal error: sysmon.h: No such file or directory

Change-Id: I3b109b98c3a2581595e87b8ef56214ddc307cb6c
Signed-off-by: Satya Durga Srinivasu Prabhala <satyap@codeaurora.org>
qup_i2c: Avoid potential panic issue

I2c register access is happening in isr before check
PM runtime status. This can lead to potential hang because of
unwanted interrupts and i2c clocks are off.

Update the i2c driver code to have register access
after PM runtime status check.

CRs-Fixed: 454710
Change-Id: I11a3d8df24c514205203f24be8e08d7c1ea1a7b8
Signed-off-by: Alok Chauhan <alokc@codeaurora.org>
vidc: Turbo mode for multiple instances

If macroblock count per second goes beyond 1080p 30fps,
then bump the clock to turbo on supported platforms.

CRs-fixed: 455464
Change-Id: I48c34c9b6987706ea3e6b412b57791e2ae07ba52
Signed-off-by: Maheshwar Ajja <majja@codeaurora.org>
Merge "power: pm8921-charger: Support multiple vbus requests"
Conflicts:
	drivers/power/pm8921-charger.c
Merge "power: pm8921-charger: disable AICL"
Conflicts:
	drivers/power/pm8921-charger.c
Merge "msm: vidc: Add free buffer api to flush state"
msm: rq_stats: Fix missing initalization of cur_freq

Initialize cur_freq variable of each online cpu to the current
running cpu clock frequency. This avoids zeroing out the load
calculations until the first notification of the change in CPU
frequency comes in after CPUFREQ governors are intialized.

Also when a non boot cpu is up, update its cur_freq variable.

(cherry picked from commit 1633a48b16614e6b85c047a19ec93867c2ced3b3)

Change-Id: I950686deff02e2339eefae7d09392dda2174a545
CRs-fixed: 446017
Signed-off-by: Venkat Devarasetty <vdevaras@codeaurora.org>
Merge "msm: kgsl: Locate index of recovery during initialization"
Conflicts:
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/adreno_ringbuffer.h
Merge "msm: kgsl: Recovery policy change"
Conflicts:
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_drawctxt.h
	drivers/gpu/msm/adreno_ringbuffer.c
Merge "msm: kgsl: Renaming recovery to fault tolerance"
Conflicts:
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno_drawctxt.h
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_snapshot.c
Merge "msm: kgsl: Detect long running IBs"
Conflicts:
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno_debugfs.c
Merge "msm: kgsl: Run GPU fault tolerance at max clock"
Merge "msm: kgsl: Reduce postmortem logs by default"
Merge "msm: kgsl: Allow fault tolerance userspace control"
Conflicts:
	drivers/gpu/msm/adreno.c
	include/linux/msm_kgsl.h
Merge "msm: kgsl: No fault tolerance if userspace sets a flag"
Merge "msm: kgsl: Limit pagefault logging to 1 per page"
Conflicts:
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_mmu.c
Merge "msm: kgsl: Allow pagefault policy to be controlled by userspace"
Merge "msm: kgsl: Debugfs entity to switch on/off userspace FT policy control"
Merge "msm: kgsl: Make the snapshot dumper more tolerant of corrupted IBs"
Conflicts:
	drivers/gpu/msm/adreno_snapshot.c
Merge "msm: kgsl: Make sure the last IB2 is in the static snapshot region"
Conflicts:
	drivers/gpu/msm/adreno_snapshot.c