mirror of
https://github.com/LineageOS/android_kernel_samsung_msm8226.git
synced 2026-09-29 00:00:25 +02:00
Steve Muckle
75c34ca1b4
* origin/msm-3.0: (87 commits) Revert "msm: kgsl: Add VBIF error detection" tspp: 8960: adding TSPP driver for 8960 board-8960: Merge secure and non secure firmware heaps. msm: msm_dsps: Move to the new clk_prepare/unprepare API. diag: Protect SMD channel from getting NULL value camera: Mercury hardware JPEG decoder driver support. msm: 8064-regulator: Remove 5V FRC gpio external regulator diag: Respond to Get Subsystem Mask request Revert "msm_fb: display: Attach and detach MDP IOMMU on suspend/resume" Revert "msm_fb: display: Add MDP IOMMU detach support for DTV" msm: rpm-8930: Fix incorrect RPM enumeration and DMM msm: board-8930: Configure GPU turbo clock to 400MHz usb: mdm_bridge: Fix bug in handling error condition msm: vidc: Invalidate the cache before processing metadata. video: msm: wfd: Add turbo mode support tty: n_smux: Add Dedicated Power Control Queue defconfig: msm-copper: Enable SPI ethernet support msm: acpuclock-8960: Add PVS support on 8064 ASoC: mdm9615: Set correct GPIOs for AUX PCM msm: 9615: Add auxpcm support over secondary audio interface ... Conflicts: arch/arm/configs/msm-copper_defconfig drivers/char/diag/diagchar_core.c drivers/char/diag/diagfwd_hsic.h drivers/media/video/msm/msm_camera.c drivers/media/video/msm/msm_mctl.c drivers/mfd/Kconfig drivers/mfd/Makefile drivers/mfd/wcd9xxx-slimslave.c drivers/spmi/spmi.c drivers/tty/n_smux.c drivers/usb/otg/msm_otg.c sound/soc/msm/msm-pcm-routing.h Signed-off-by: Steve Muckle <smuckle@codeaurora.org> Change-Id: I49d4ceff17714a7ba51243de63f27b7e78647bda