Merge AU_LINUX_ANDROID_JB_2.5.04.02.02.40.184

Change-Id: I2bbcadc161787dc3233f93695adf6c297de81843

Conflicts:
	Makefile
	arch/arm/Kconfig.debug
	arch/arm/configs/fsm9xxx-perf_defconfig
	arch/arm/configs/fsm9xxx_defconfig
	arch/arm/configs/msm8974_defconfig
	arch/arm/include/asm/io.h
	arch/arm/kernel/irq.c
	arch/arm/kernel/process.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/Makefile.boot
	arch/arm/mach-msm/acpuclock-8x60.c
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-msm/clock-8x60.c
	arch/arm/mach-msm/cpufreq.c
	arch/arm/mach-msm/devices-msm8x60.c
	arch/arm/mach-msm/devices-msm8x60.h
	arch/arm/mach-msm/devices.h
	arch/arm/mach-msm/gpiomux-8x60.h
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/camera.h
	arch/arm/mach-msm/include/mach/gpio.h
	arch/arm/mach-msm/include/mach/ion.h
	arch/arm/mach-msm/include/mach/mpm.h
	arch/arm/mach-msm/include/mach/msm72k_otg.h
	arch/arm/mach-msm/include/mach/msm_hsusb.h
	arch/arm/mach-msm/include/mach/msm_hsusb_hw.h
	arch/arm/mach-msm/include/mach/msm_memtypes.h
	arch/arm/mach-msm/include/mach/qdsp6v2/apr_tal.h
	arch/arm/mach-msm/include/mach/qdsp6v2/audio_dev_ctl.h
	arch/arm/mach-msm/include/mach/qdsp6v2/q6voice.h
	arch/arm/mach-msm/mdm.c
	arch/arm/mach-msm/memory.c
	arch/arm/mach-msm/modem-8660.c
	arch/arm/mach-msm/msm_bus/msm_bus_board_8660.c
	arch/arm/mach-msm/msm_rq_stats.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/qdsp6v2/Makefile
	arch/arm/mach-msm/qdsp6v2/apr.c
	arch/arm/mach-msm/qdsp6v2/apr_tal.c
	arch/arm/mach-msm/qdsp6v2/audio_dev_ctl.c
	arch/arm/mach-msm/qdsp6v2/audio_lpa.c
	arch/arm/mach-msm/qdsp6v2/audio_multi_aac.c
	arch/arm/mach-msm/qdsp6v2/audio_mvs.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
	arch/arm/mach-msm/qdsp6v2/pcm_out.c
	arch/arm/mach-msm/qdsp6v2/q6voice.c
	arch/arm/mach-msm/qdsp6v2/rtac.c
	arch/arm/mach-msm/qdsp6v2/snddev_icodec.c
	arch/arm/mach-msm/qdsp6v2/snddev_icodec.h
	arch/arm/mach-msm/restart.c
	arch/arm/mach-msm/rmt_storage_client.c
	arch/arm/mach-msm/sdio_al.c
	arch/arm/mach-msm/sdio_al_dloader.c
	arch/arm/mach-msm/sdio_al_test.c
	arch/arm/mach-msm/sdio_cmux.c
	arch/arm/mach-msm/sdio_ctl.c
	arch/arm/mach-msm/sdio_tty.c
	arch/arm/mach-msm/subsystem_restart.c
	arch/arm/mach-msm/timer.c
	arch/arm/vfp/vfpmodule.c
	block/genhd.c
	drivers/Makefile
	drivers/char/msm_rotator.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/hwmon/m_adcproc.c
	drivers/hwmon/msm_adc.c
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/input/misc/Kconfig
	drivers/input/misc/Makefile
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/media/video/msm/Kconfig
	drivers/media/video/msm/Makefile
	drivers/media/video/msm/gemini/msm_gemini_common.h
	drivers/media/video/msm/gemini/msm_gemini_sync.c
	drivers/media/video/msm/io/msm_io_8x60.c
	drivers/media/video/msm/msm_camera.c
	drivers/mfd/Kconfig
	drivers/mfd/marimba-core.c
	drivers/mfd/pm8xxx-irq.c
	drivers/mfd/pm8xxx-misc.c
	drivers/mfd/pmic8901.c
	drivers/mfd/timpani-codec.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/pmic8058-xoadc.c
	drivers/mmc/core/core.c
	drivers/mmc/host/msm_sdcc.c
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/power/Kconfig
	drivers/tty/serial/msm_serial_hs_hwreg.h
	drivers/usb/core/hub.c
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/Makefile
	drivers/usb/gadget/android.c
	drivers/usb/gadget/f_acm.c
	drivers/usb/gadget/f_audio_source.c
	drivers/usb/gadget/f_diag.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/gadget/f_rmnet.c
	drivers/usb/gadget/f_rmnet_sdio.c
	drivers/usb/gadget/msm72k_udc.c
	drivers/usb/gadget/storage_common.c
	drivers/usb/gadget/u_serial.c
	drivers/usb/host/ehci-msm72k.c
	drivers/usb/otg/msm72k_otg.c
	drivers/usb/otg/msm_otg.c
	drivers/video/Kconfig
	drivers/video/msm/Kconfig
	drivers/video/msm/Makefile
	drivers/video/msm/external_common.c
	drivers/video/msm/external_common.h
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/hdmi_msm.h
	drivers/video/msm/logo.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_dtv.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_util.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/msm_dss_io_8x60.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	fs/ecryptfs/file.c
	fs/ext4/namei.c
	fs/jbd2/transaction.c
	include/linux/m_adcproc.h
	include/linux/mfd/marimba.h
	include/linux/mfd/pm8xxx/gpio.h
	include/linux/mfd/pmic8058.h
	include/linux/mfd/pmic8901.h
	include/linux/msm_adc.h
	include/linux/msm_audio.h
	include/linux/msm_mdp.h
	include/linux/pmic8058-xoadc.h
	include/linux/usb/msm_hsusb.h
	include/media/msm_camera.h
	kernel/irq/spurious.c
	kernel/power/earlysuspend.c
	kernel/power/main.c
	kernel/power/wakelock.c
	kernel/workqueue.c
	mm/madvise.c
	sound/soc/msm/msm-multi-ch-pcm-q6.c
	sound/soc/msm/msm8x60.c
	sound/soc/msm/qdsp6/q6afe.c