Pull cm-10.1-chad's dlx_defconfig
update crpalmer-build-config
Bulk update all fb and gpu drivers from mako + Fixup for monarudo.
Monarudo display still needs to be worked further but this gets
a working fb and initial display.

Conflicts:
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/include/mach/iommu.h
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_drawctxt.c
	drivers/gpu/msm/adreno_pm4types.h
	drivers/gpu/msm/adreno_postmortem.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_gpummu.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_mmu.h
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_snapshot.c
	drivers/gpu/msm/z180.c
	drivers/gpu/msm/z180.h
	drivers/iommu/Kconfig
	drivers/iommu/msm_iommu.c
	drivers/video/msm/lvds_frc_fhd.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/mipi_chimei_wuxga.c
	drivers/video/msm/mipi_chimei_wxga_pt.c
	drivers/video/msm/mipi_truly.h
	drivers/video/msm/vidc/1080p/ddl/vidc_hwio.h
	drivers/video/msm/vidc/common/vcd/vcd_util.h
Allow the display to turn back on

Moved the display on/off code back to display_on / _off instead of
combining it with the lcd_on/off.

Before this commit, the display would work until you turned it off
(sleep).  After that, the display would not work.  Now, the display
turns on and off as normal.

Change-Id: I757dde27b77649207f2dc4d175c0a2fe168b94ca
Tone down HTC's debugging messages at info level

Change-Id: Ib08c1da72afee17945f83e939c364adf798d37dd

Conflicts:
	arch/arm/mach-msm/htc_battery_8960.c
msm_fb: Verizon/HTC compatible version of set_overlay ioctl

This ignores the sharpness setting that could be passed as an
option to the frame buffer.  As far as I can tell, the sharpness
is not used by the HTC display driver.
monarudo-display: add gamma correction table to the fb
cgroup: Add generic cgroup subsystem permission checks

Rather than using explicit euid == 0 checks when trying to move
tasks into a cgroup via CFS, move permission checks into each
specific cgroup subsystem. If a subsystem does not specify a
'allow_attach' handler, then we fall back to doing our checks
the old way.

Use the 'allow_attach' handler for the 'cpu' cgroup to allow
non-root processes to add arbitrary processes to a 'cpu' cgroup
if it has the CAP_SYS_NICE capability set.

This version of the patch adds a 'allow_attach' handler instead
of reusing the 'can_attach' handler.  If the 'can_attach' handler
is reused, a new cgroup that implements 'can_attach' but not
the permission checks could end up with no permission checks
at all.

Change-Id: Icfa950aa9321d1ceba362061d32dc7dfa2c64f0c
Original-Author: San Mehat <san@google.com>
Signed-off-by: Colin Cross <ccross@android.com>
Fix duplicated line in merge resolution
Add msm_ion.h
Kbuild: copy MSM headers as well
Add bcmdhd 1.88.10 and use it in place of HTCs version.

Change-Id: I54a3b2e8fb573b9eff7aa48b55beada99705a0e4
bluetooth: bulk update to the CAF drivers

Change-Id: Iacd9fe4a54ec783e6fff1f767f7ca264a79cc246
board-monarudo: Rename msm_serial_hs_brcm to msm_serial_hs.

Change-Id: I79e04e0c189523988c8be2f95dcb8cb7fbe9a882
Add bluedroid compatible bluesleep and utilize it.

Change-Id: Ib6b7ccb5037823ae54c4fc988ebce935366b444c
Update defconfig

Change-Id: I2f11f393b057543f4976f719ad86ffec66cabb75
msm_fb: hdmi: Resolution modes on HDMI

Add a new header file that lists all supported
HDMI resolution modes and the associated timing
information.

CRs-Fixed: 470335
Change-Id: I971422ddb97e3b219cc682032eb67212b434daab
Signed-off-by: Aravind Venkateswaran <aravindh@codeaurora.org>
Signed-off-by: Manoj Rao <manojraj@codeaurora.org>
msm: rotator: sync point support Add MSM_ROTATOR_IOCTL_BUFFER_SYNC ioctl interface. Rotator will create a timeline for each session at START, wait for input fence and create released fence in this ioctl call, signal the timeline after rotation is done.

Change-Id: I4682b0891e996111d97c345a97d5ce81ffb31c7d
rt5501: Reduce gain to -6dB, turn additonal noise gate on
Merge remote-tracking branch 'cm-10.1/cm-10.1-chad' into 2.0.x-cm

Conflicts:
	crpalmer-build-config
	drivers/gpu/msm/kgsl.c
	drivers/iommu/amd_iommu.c
	drivers/thermal/msm8960_tsens.c
	drivers/usb/core/hub.c
	drivers/usb/host/ehci-msm-hsic.c
	net/bluetooth/l2cap_core.c