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