defconfig: per http://source.android.com/devices/tech/kernel.html

Change-Id: Ia041dc394ba8c2b158680fcbf4c0d2c79780add1
defconfig: Unselect CONFIG_MSM_WATCHDOG_CTX_PRINT

Moto code seems to be dependent on lots of other things and
we don't really need this for everyday use

Change-Id: I0df274a828ff66e59437eaca1fcf8a820f9fed87
msm: board 8960: Reduce EBI1 memory for audio usecase

from 2fd017a3012b86a754773eaafb6928296be784ca
omitted in daa3fcf31a14ee86530015b77b38207a01885f05
msm: kgsl: Use the correct units for ADRENO_IDLE_TIMEOUT

In a few spots the ADRENO_IDLE_TIMEOUT value (measured in milliseconds)
was used directly for jiffy calculations resulting in timeouts that were
1000/HZ times longer than they should have been.  Use msecs_to_jiffies
for these situations.

CRs-Fixed: 448226
Change-Id: Ic0dedbad33630706d909931bf616bd69399f7ff1
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Revert "msm: rotator: sync point support"

This reverts commit ca223e561be9519098679c6ef48109f36b4ff562.

Conflicts:
	drivers/char/msm_rotator.c

Change-Id: I8da6633dac43b8eefae0848d9407bf8700c27515
msm: rotator: Add secure session flag to rotator start data

Add flag for handling secure session to rotator data passed during
start ioctl call.

Change-Id: Id5db8b4be1f5058cb9cb9227963acc288eebc1dd
Signed-off-by: Ravishangar Kalyanam <rkalya@codeaurora.org>

Conflicts:
	drivers/char/msm_rotator.c
msm: rotator: non-blocking rotate

Send request to a work queue and return right away.
Work queue will go through the commit queue to do the
rotation. wait_for_finish can be set to true to make
rotation go back to blocking.

Change-Id: Ifc2e36bd24d9681d42105f4ccbb62a8777af2a6c
Signed-off-by: Ken Zhang <kenz@codeaurora.org>

Conflicts:
	drivers/char/msm_rotator.c
msm_fb: display: check FB_ACTIVATE_VBL bit only

FB_ACTIVATE_VBL bit is set to enable TE logic at pan_display
and unset to disable TE logic at pan_display for smart panel.
This patch checks for FB_ACTIVATE_VBL bit set only instead of
value.

CRs-fixed: 433399
Change-Id: I6fc913c6752fcca6a27c783c45ab318065217973
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
msm: display: sync point clean up

Remove unused fence input in mdp_display_commit
structure
Use different timeline name for different fb

Change-Id: I4edd335b36dce057ff3e54302af6088a9cc470ec
Signed-off-by: Ken Zhang <kenz@codeaurora.org>

Conflicts:
	drivers/video/msm/msm_fb.c
	include/linux/msm_mdp.h
msm: display: increase fence timeout

Increase timeout value to 900ms to allow
gfx engine to render longer.
When sync_fence_wait fails, need not put fence as
it will be handled outside the loop.

Change-Id: Id4caff55c9f99c48e5f87a85d30fe4c8c0cd65e7
Signed-off-by: Ken Zhang <kenz@codeaurora.org>
msm_fb: display: Copy splash image to kernel memory

The bootloader memory from which the splashscreen is shown
gets reclaimed before frame update happens from framework.
Hence, copy the splash image to a local buffer as soon as
display is initialized. This will ensure proper continuous
splashscreen functionality.

CRs-Fixed: 378721
Change-Id: I55a7b97eeced56d2f108d34998d58966610c4305
Signed-off-by: Pradeep Jilagam <pjilagam@codeaurora.org>

Conflicts:

	drivers/video/msm/msm_fb.h

Signed-off-by: Mayank Goyal <goyalm@codeaurora.org>

Conflicts:
	drivers/video/msm/mdp.c
	drivers/video/msm/msm_fb.h
board-msm8960-common: Copy splash image to kernel memory

Change-Id: Ia840545d162b8ccd971edb7cf15a949a776ad1e9
board-msm8960-common: missed define of mdp_iommu_split_domain

from commit b59addaf0e5ac9414a118c5e3a2db243c8f9f3ba

Change-Id: I33420a74ed2275b3dbb2bc4258f9a2a9b8739a7a
Merge pull request #13 from razrqcom-dev-team/cm-10.1

Cm 10.1