Merge commit '406a0a8400fd2d1d5b68c993e191f4c05a8c23a9' into android-msm-mako-3.4-wip
(needs additional patches to compile)
* commit '406a0a8400fd2d1d5b68c993e191f4c05a8c23a9': (450 commits)
msm: vidc: Separate partition for shared memory
arm/dt: Move MDSS device nodes to separate dtsi file
msm: cpr: Add support for CPR in 8625
defconfig: msm8974: enable genlock
msm: Remove idle stats and cpuidle hooks
msm: timer: Add a stub for msm_timer_get_timer0_base
msm: iomap: Add mappings for the MPM PS_HOLD region
msm: vidc: Adds support for Rate Control
ASoc: msm: Add low latency playback and recording support.
msm: Fix for overflow cpu alive mask dump.
tty: hold lock across tty buffer finding and buffer filling
msm: Turn off cpu alive mask messages.
msm: kgsl: Add GPU clock statistics.
Bluetooth: Enable BT&FM kernel modules for MSM8974
v4l2: Add mutex to streamon() and dqbuf()in v4l2 framework.
msm: mdss: fix suspend coming to MDP before panel drivers
msm: mdss: allocate framebuffer memory from ion pool
msm: mdss: improve clock and bus scaling logic
platform: msm: Add driver for QPNP PMIC clkdiv peripherals
msm: add adsp loader driver
...
Conflicts:
drivers/base/power/main.c
drivers/power/pm8921-bms.c
drivers/power/pm8921-charger.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/android.c
drivers/usb/host/ehci-msm-hsic.c
drivers/video/msm/mdp4_overlay_dsi_video.c
include/linux/mfd/pm8xxx/pm8921-charger.h
Signed-off-by: Iliyan Malchev <malchev@google.com>