Merge tag 'AU_LINUX_ANDROID_JB_2.6.04.03.00.109.025' into cm-10.2-dt

AU_LINUX_ANDROID_JB_2.6.04.03.00.109.025 based on quic/aosp/jb_2.6

Conflicts:
	arch/arm/configs/msm8960_defconfig
	arch/arm/mach-msm/board-8064-pmic.c
	arch/arm/mach-msm/board-8930-pmic.c
	arch/arm/mach-msm/board-8930.c
	arch/arm/mach-msm/board-8960-camera.c
	arch/arm/mach-msm/board-8960-pmic.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/cache_erp.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/spm_devices.c
	arch/arm/mach-msm/subsystem_restart.c
	arch/arm/mm/dma-mapping.c
	drivers/char/diag/diagchar_core.c
	drivers/char/msm_rotator.c
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_drawctxt.h
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl_events.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/gpu/msm/kgsl_sync.c
	drivers/hwmon/epm_adc.c
	drivers/media/video/msm/gemini/msm_gemini_hw.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm.h
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/server/msm_cam_server.c
	drivers/media/video/msm/vfe/msm_vfe32.c
	drivers/mmc/core/core.c
	drivers/mmc/core/core.h
	drivers/mmc/core/mmc.c
	drivers/mmc/host/msm_sdcc.c
	drivers/net/wireless/wcnss/wcnss_riva.c
	drivers/net/wireless/wcnss/wcnss_wlan.c
	drivers/power/pm8921-bms.c
	drivers/power/pm8921-charger.c
	drivers/spi/spi_qsd.c
	drivers/thermal/pm8xxx-tm.c
	drivers/tty/serial/msm_serial_hs.c
	drivers/usb/gadget/ci13xxx_udc.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_shared_mem.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	drivers/video/msm/vidc/common/enc/venc.c
	include/linux/mfd/pm8xxx/pm8921-charger.h
	include/linux/msm_rotator.h
	include/linux/msm_vidc_enc.h
	include/linux/nl80211.h
	include/linux/wcnss_wlan.h
	include/media/msm/vcd_property.h
	include/media/msm_camera.h
	include/video/msm_hdmi_modes.h
	kernel/signal.c
	scripts/gcc-wrapper.py
	sound/soc/msm/msm-pcm-routing.c
	sound/soc/msm/msm-pcm-routing.h
	sound/soc/msm/msm8960.c
Revert "msm: camera: Enable AVTimer related APIs"

This reverts commit d0a741be111af0e28fda6188bde56f800d92fd8d.