Merge branch 'ics_chocolate' into master

Conflicts:
	arch/arm/mach-msm/include/mach/camera.h
	drivers/media/video/msm/actuators/dw9712_act.c
	drivers/media/video/msm/actuators/imx074_act.c
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/actuators/msm_actuator.h
	drivers/media/video/msm/csi/msm_csic.c
	drivers/media/video/msm/csi/msm_csic.h
	drivers/media/video/msm/csi/msm_csid.c
	drivers/media/video/msm/csi/msm_csid.h
	drivers/media/video/msm/csi/msm_csiphy.c
	drivers/media/video/msm/csi/msm_csiphy.h
	drivers/media/video/msm/csi/msm_ispif.c
	drivers/media/video/msm/csi/msm_ispif.h
	drivers/media/video/msm/flash.c
	drivers/media/video/msm/gemini/msm_gemini_common.h
	drivers/media/video/msm/gemini/msm_gemini_core.h
	drivers/media/video/msm/gemini/msm_gemini_platform.h
	drivers/media/video/msm/gemini/msm_gemini_sync.h
	drivers/media/video/msm/imx072.c
	drivers/media/video/msm/imx072.h
	drivers/media/video/msm/imx072_reg.c
	drivers/media/video/msm/imx074.c
	drivers/media/video/msm/io/msm_camera_eeprom.c
	drivers/media/video/msm/io/msm_camera_eeprom.h
	drivers/media/video/msm/io/msm_camera_i2c.c
	drivers/media/video/msm/io/msm_camera_i2c.h
	drivers/media/video/msm/io/msm_io_util.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm.h
	drivers/media/video/msm/msm_camera.c
	drivers/media/video/msm/msm_gemini_core.c
	drivers/media/video/msm/msm_gemini_dev.c
	drivers/media/video/msm/msm_gemini_hw.c
	drivers/media/video/msm/msm_gemini_hw.h
	drivers/media/video/msm/msm_gemini_platform.c
	drivers/media/video/msm/msm_gemini_sync.c
	drivers/media/video/msm/msm_io_7x27a.c
	drivers/media/video/msm/msm_io_7x27a_v4l2.c
	drivers/media/video/msm/msm_io_8960.c
	drivers/media/video/msm/msm_io_8x60.c
	drivers/media/video/msm/msm_io_vfe31.c
	drivers/media/video/msm/msm_io_vfe31_v4l2.c
	drivers/media/video/msm/msm_isp.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/msm_mctl_buf.c
	drivers/media/video/msm/msm_mctl_pp.c
	drivers/media/video/msm/msm_mem.c
	drivers/media/video/msm/msm_vfe31.c
	drivers/media/video/msm/msm_vfe31.h
	drivers/media/video/msm/msm_vfe31_v4l2.c
	drivers/media/video/msm/msm_vfe31_v4l2.h
	drivers/media/video/msm/msm_vfe32.c
	drivers/media/video/msm/msm_vfe32.h
	drivers/media/video/msm/msm_vfe7x.c
	drivers/media/video/msm/msm_vfe7x27a.c
	drivers/media/video/msm/msm_vfe7x27a.h
	drivers/media/video/msm/msm_vfe7x27a_v4l2.c
	drivers/media/video/msm/msm_vfe7x27a_v4l2.h
	drivers/media/video/msm/msm_vfe8x.c
	drivers/media/video/msm/msm_vfe8x_proc.c
	drivers/media/video/msm/msm_vpe.c
	drivers/media/video/msm/msm_vpe.h
	drivers/media/video/msm/msm_vpe1.c
	drivers/media/video/msm/msm_vpe1.h
	drivers/media/video/msm/mt9d112.c
	drivers/media/video/msm/mt9d113.c
	drivers/media/video/msm/mt9d113.h
	drivers/media/video/msm/mt9d113_reg.c
	drivers/media/video/msm/mt9e013.c
	drivers/media/video/msm/mt9e013.h
	drivers/media/video/msm/mt9e013_reg.c
	drivers/media/video/msm/mt9p012_fox.c
	drivers/media/video/msm/ov5640.c
	drivers/media/video/msm/ov5640.h
	drivers/media/video/msm/ov7692.c
	drivers/media/video/msm/ov7692_qrd.c
	drivers/media/video/msm/ov9726.c
	drivers/media/video/msm/ov9726.h
	drivers/media/video/msm/ov9726_reg.c
	drivers/media/video/msm/qs_s5k4e1.c
	drivers/media/video/msm/qs_s5k4e1.h
	drivers/media/video/msm/qs_s5k4e1_reg.c
	drivers/media/video/msm/s5k4e1.c
	drivers/media/video/msm/s5k4e1.h
	drivers/media/video/msm/s5k4e1_reg.c
	drivers/media/video/msm/sensors/imx074_v4l2.c
	drivers/media/video/msm/sensors/imx091.c
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/msm_sensor.h
	drivers/media/video/msm/sensors/mt9e013_v4l2.c
	drivers/media/video/msm/sensors/mt9m114_v4l2.c
	drivers/media/video/msm/sensors/ov2720.c
	drivers/media/video/msm/sensors/ov2720.h
	drivers/media/video/msm/sensors/ov9726_v4l2.c
	drivers/media/video/msm/sensors/s5k3l1yx.c
	drivers/media/video/msm/sensors/s5k4e1_v4l2.c
	drivers/media/video/msm/sn12m0pz.c
	drivers/media/video/msm/vx6953.c
	drivers/media/video/msm/vx6953_reg_v4l2.c
	drivers/media/video/msm/vx6953_v4l2.c
	drivers/media/video/msm/vx6953_v4l2.h
	drivers/media/video/msm/wfd/enc-subdev.c
	drivers/media/video/msm/wfd/enc-subdev.h
	drivers/media/video/msm/wfd/mdp-subdev.c
	drivers/media/video/msm/wfd/mdp-subdev.h
	drivers/media/video/msm/wfd/vsg-subdev.c
	drivers/media/video/msm/wfd/vsg-subdev.h
	drivers/media/video/msm/wfd/wfd-ioctl.c
	drivers/media/video/msm/wfd/wfd-util.c
	drivers/media/video/msm/wfd/wfd-util.h
	include/linux/bma150.h
	include/media/msm_camera.h
Merge branch 'M7630AABBQMLZA404033I-nAa-master' into ics_chocolate-nAa-master
Import TI_ST related drivers from kernel 3.8

Thanks to @M66B

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I2c7703aa43109de2a9d490e2559e015a5ec9b492
Import UHID driver from kernel 3.8

Thanks to @M66B

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ida53032d65b1f09a77195b86320536d2d053cd7c
Adapt TI bluedroid stack for mogami board

Thanks @M66B & @pcfighter

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I80c585ebecb1bc09036b747d2f22402b0468f176
mogami: remove old rfkill implementation

BT is managed by BT_WILINK & TI_ST drivers now

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I629c8b098ee85a8b4248d7d3eacada43360dd5f0
mogami defconfigs: Enable BT_WILINK & TI_ST for JB MR1 BlueDroid stack

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ic8d0b1e9d5f7e5fd6547a9f5cfe310028c7a12a4
mogami defconfigs: Enable UHID driver

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: I930a41ad6bb29cf660536e605f2705c106f6337b
Update defconfigs

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ib75d8d81d3a84386843356e1bca195177ce18046
leds: hardcode max_current

Instead of relying to scripts to set the max_current at boot time, hardcode the values in the drivers like it was done for zeus board

Change-Id: Ia92a0b0193803fefb3f32569e0414604855c64e9
Signed-off-by: Michael Bestas <mikeioannina@gmail.com>
leds: regrant users access to leds' real safe max current

This extends the patch for hardcoded stock values.
With only it the users can't go above stock values, even though the leds are made to work
on bigger currents between 20-25mA.

This commit fixes it and lets users again to reach hardware's max safe current through scripts and also maintains OEMs' stock values if no script is used.

Signed-off-by: Konstantinos Missos <ctcaer@gmail.com>
anzu: fix ALS

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ib3e13b745c422848ef12e4063673f057fdbf849e