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