Steve Muckle
75c34ca1b4
Merge remote branch 'origin/msm-3.0' into msm-3.4
* 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
2012-06-12 14:28:21 -07:00
..
2012-03-19 15:08:20 -03:00
2012-02-08 10:46:54 -02:00
2012-06-09 03:04:37 +05:30
2011-07-27 17:55:39 -03:00
2012-03-19 15:04:10 -03:00
2011-12-20 09:36:18 -02:00
2012-01-06 11:01:11 -02:00
2010-12-29 08:17:19 -02:00
2010-12-30 08:02:14 -02:00
2012-01-05 06:49:38 -02:00
2012-04-28 22:36:01 +05:30
2010-12-29 08:16:50 -02:00
2012-06-09 09:47:27 -06:00
2011-06-11 09:03:20 -03:00
2011-03-31 11:26:23 -03:00
2011-09-24 00:23:03 -03:00
2012-03-16 10:38:24 -04:00
2011-03-22 04:52:22 -03:00
2011-12-20 09:31:50 -02:00
2011-07-27 17:53:01 -03:00
2012-06-11 11:25:08 +05:30
2011-10-03 09:57:10 -07:00
2012-05-19 12:34:34 -06:00
2012-03-12 11:41:07 +05:30
2012-06-09 09:47:27 -06:00
2012-04-07 17:06:38 -07:00
2012-05-21 18:08:38 -07:00
2012-03-19 18:56:33 -03:00
2011-09-11 09:49:28 -03:00
2011-09-21 15:31:08 -03:00
2011-01-19 11:45:30 -02:00
2011-05-20 09:29:49 -03:00
2011-03-21 20:31:40 -03:00
2011-12-20 09:31:00 -02:00
2011-11-03 18:28:05 -02:00
2011-07-27 17:53:00 -03:00
2012-05-28 19:00:49 +05:30
2011-09-03 20:56:22 -03:00
2012-06-06 18:45:28 -07:00
2011-11-03 18:29:11 -02:00
2011-09-24 00:22:31 -03:00
2012-02-28 18:26:40 -03:00
2010-12-29 08:17:18 -02:00
2011-11-06 19:44:47 -08:00
2012-03-19 22:11:06 -03:00
2011-07-27 17:56:08 -03:00
2010-12-29 08:16:35 -02:00
2012-02-28 18:25:46 -03:00
2011-11-03 18:28:12 -02:00
2012-04-26 11:30:12 -03:00
2011-11-03 18:27:13 -02:00
2012-05-04 11:03:07 +05:30
2011-07-27 17:53:07 -03:00
2010-12-29 08:16:46 -02:00
2012-02-14 17:20:46 -02:00
2012-05-17 11:20:06 +05:30
2012-03-19 15:04:26 -03:00
2011-03-22 16:37:54 -03:00
2012-06-06 18:45:28 -07:00
2012-03-19 14:06:12 -03:00
2011-04-13 09:53:29 -03:00
2011-07-27 17:53:34 -03:00
2011-07-27 17:53:31 -03:00
2011-10-31 19:32:32 -04:00
2012-05-18 14:43:33 -07:00
2011-09-24 00:21:31 -03:00
2011-03-22 04:55:05 -03:00
2011-11-03 18:29:02 -02:00
2012-05-24 19:41:49 -04:00
2012-05-24 19:41:49 -04:00
2011-11-03 18:29:13 -02:00
2011-09-06 15:05:10 -03:00
2011-03-21 20:31:34 -03:00
2011-03-22 04:55:05 -03:00
2012-05-28 08:13:55 -07:00
2011-03-22 04:55:05 -03:00
2010-12-29 08:17:07 -02:00
2011-09-27 18:08:04 +02:00
2011-05-25 21:42:30 -03:00
2011-10-03 10:26:23 -07:00
2011-03-21 20:32:19 -03:00