jf: insidesecure vpn: goodbye

Change-Id: I7a6a2ba068a13a6371636c2fb5f60a485284d7df
drivers: gpu: s/msm2/msm/

* back to mainline msm

Change-Id: I5003557a1e22570d4c5cb1dee72e608a9015ee06
Revert "msm: kgsl: Add separate GPU shader memory mapping"

This reverts commit 7ad8ff977a892e1d289305f15588921d48ab6994.

Conflicts:
	arch/arm/mach-msm/iommu_domains.c

Change-Id: Ifd513fe3a235652f25e1a93af9e3b31740444982
Revert "Execute shader on wakeup from power collapse"

This reverts commit 28eabf6987637c6c438c461aa31ce25e0f7edcc5.

Conflicts:

	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/adreno_ringbuffer.c

Change-Id: I0a979f33d9030546d1e72b63cff88d269f63a4c7
Signed-off-by: Hareesh Gundu <hareeshg@codeaurora.org>
Revert "msm: scm: Add scm_call_atomic3"

This reverts commit d1b060368fa27833e5ee49b1e9323a5e13fe80eb.

Change-Id: If488e88a4271d86565e5be4f59280ec2188396b5
Revert "msm: scm-pas: Provide a strongly ordered buffer to the secure world"

This reverts commit 10751a4a2d3b6f3e4f73640a2d7ccf59db8ec1cd.

Change-Id: I72377068d8b4407e374616ed2c4e4f33bf5d5c90
Revert "ARM: Add support for 64 bit register reads/writes"

This reverts commit f934a7d049277ee5c56104f0634e11aa96d5d66b.

Change-Id: Ide6474feeab9513012a6b7004974e9211ed51aa3
Revert "iommu/core: pass a user-provided token to fault handlers"

This reverts commit a58bee5bb2c3437950f49be0ea8acbf6b794c346.

Conflicts:
	drivers/media/video/msm/vfe/msm_vfe32.c

Change-Id: Ic558a862ab929b9a1dac3ce99556d95f487f5ead
Merge "jf: insidesecure vpn: goodbye" into cm-11.0
Merge branch 'cm-11.0' into kk_mkt