Merge branch 'caf' into android-msm-mako-3.4-wip
* caf: (219 commits)
usb: msm_otg: Fix error handling bug in driver probe
bluetooth: Add support for LE conn param
msm: ocmem: Initialize the ocmem graphics mPU
msm: ocmem: Add support for low power clients
msm-fb: display: Tearing issue during video playback
ASoC: WCD9304: Fix register sequence for analog mic recording
msm: clock-8974: Correct some audio interface clock structures.
ASoC: wcd9310: Clear the status only for active slimbus ports
msm: kgsl: Allow non-default timeout values in adreno_idle
msm: cache_erp: Add device tree support
ASOC: msm: Add device tree specific changes in compressed driver
drivers: leds-pm8xxx: enable low power mode for RGB LED
msm: 8974: Add function to reserve memory from device tree
msm: clock-8974: Add block reset support for the USB cores
msm_fb: display: Brightness change observed when switching HDMI on
msm: mpq8064: Dummy read to prevent false interrupt from triggering
mmc: msm_sdcc: Enable AUTO_PROG_DONE for CMD25
msm: rpm: remove the sanity check in rpm log
msm: camera: Add some minor code fixes.
msm: Always compile acpuclock-krait when CONFIG_ARCH_MSM_KRAIT is set
...
Conflicts:
arch/arm/mach-msm/clock-8960.c
arch/arm/mach-msm/subsystem_restart.c
drivers/media/video/msm/msm_camirq_router.c
drivers/media/video/msm/msm_mctl.c
drivers/usb/gadget/f_mass_storage.c
drivers/video/msm/msm_fb.c
sound/soc/msm/apq8064.c