Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_kernel_samsung_msm8660-common into jellybean2

Conflicts:
	Documentation/cpu-freq/governors.txt
	Makefile
	arch/arm/Kconfig
	arch/arm/Kconfig.debug
	arch/arm/configs/cyanogenmod_hercules_defconfig
	arch/arm/configs/cyanogenmod_quincyatt_defconfig
	arch/arm/configs/cyanogenmod_quincytmo_defconfig
	arch/arm/configs/cyanogenmod_skyrocket_defconfig
	arch/arm/kernel/irq.c
	arch/arm/kernel/smp.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-8064-display.c
	arch/arm/mach-msm/board-bluetooth-bcm4330.c
	arch/arm/mach-msm/board-msm8x60_celox.c
	arch/arm/mach-msm/board-msm8x60_dali.c
	arch/arm/mach-msm/board-msm8x60_q1.c
	arch/arm/mach-msm/board-storage-common-a.h
	arch/arm/mach-msm/broadcom_wlan.c
	arch/arm/mach-msm/clock-8x60.c
	arch/arm/mach-msm/clock-dss-8960.c
	arch/arm/mach-msm/cpufreq.c
	arch/arm/mach-msm/cpuidle.c
	arch/arm/mach-msm/devices-msm8x60.c
	arch/arm/mach-msm/devices-msm8x60.h
	arch/arm/mach-msm/gpio-v2.c
	arch/arm/mach-msm/gpiomux-8x60_celox.c
	arch/arm/mach-msm/gpiomux-8x60_dali.c
	arch/arm/mach-msm/gpiomux-8x60_q1.c
	arch/arm/mach-msm/idle_stats.c
	arch/arm/mach-msm/idle_stats.h
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/camera.h
	arch/arm/mach-msm/include/mach/devices-lte.h
	arch/arm/mach-msm/include/mach/gpio.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/qdsp6v2/q6voice.h
	arch/arm/mach-msm/include/mach/sec_battery.h
	arch/arm/mach-msm/include/mach/sec_debug.h
	arch/arm/mach-msm/include/mach/sec_switch.h
	arch/arm/mach-msm/include/mach/tdmb_pdata.h
	arch/arm/mach-msm/include/mach/usb_dun_bridge.h
	arch/arm/mach-msm/include/mach/usb_gadget_fserial.h
	arch/arm/mach-msm/lpass-8660.c
	arch/arm/mach-msm/mdm.c
	arch/arm/mach-msm/memory.c
	arch/arm/mach-msm/msm_rq_stats.c
	arch/arm/mach-msm/msm_watchdog.c
	arch/arm/mach-msm/peripheral-loader.c
	arch/arm/mach-msm/qdsp5/adsp_driver.c
	arch/arm/mach-msm/qdsp5/adsp_video_verify_cmd.c
	arch/arm/mach-msm/qdsp5/adsp_videoenc_verify_cmd.c
	arch/arm/mach-msm/qdsp5/audio_aac.c
	arch/arm/mach-msm/qdsp5/audio_aac_in.c
	arch/arm/mach-msm/qdsp5/audio_amrnb.c
	arch/arm/mach-msm/qdsp5/audio_amrnb_in.c
	arch/arm/mach-msm/qdsp5/audio_amrwb.c
	arch/arm/mach-msm/qdsp5/audio_evrc.c
	arch/arm/mach-msm/qdsp5/audio_evrc_in.c
	arch/arm/mach-msm/qdsp5/audio_mp3.c
	arch/arm/mach-msm/qdsp5/audio_pcm.c
	arch/arm/mach-msm/qdsp5/audio_pcm_in.c
	arch/arm/mach-msm/qdsp5/audio_qcelp.c
	arch/arm/mach-msm/qdsp5/audio_qcelp_in.c
	arch/arm/mach-msm/qdsp5/audio_wmapro.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_mvs.c
	arch/arm/mach-msm/qdsp6v2/audio_utils_aio.c
	arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio-Q1.c
	arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
	arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio_a2.c
	arch/arm/mach-msm/qdsp6v2/pcm_out.c
	arch/arm/mach-msm/qdsp6v2/q6voice.c
	arch/arm/mach-msm/qdsp6v2/timpani_profile_a2_att.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_celox_att.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_celox_att_tmo.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_celox_eur.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_celox_jpn_ntt.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_celox_kor.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_celox_tmo.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_celoxhd_att.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_dali_kt.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_dali_lgt.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_dali_skt.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_p5lte_att.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_quincy_att.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_quincy_kt.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_quincy_lgt.h
	arch/arm/mach-msm/qdsp6v2/timpani_profile_quincy_skt.h
	arch/arm/mach-msm/restart.c
	arch/arm/mach-msm/sdio_al_dloader.c
	arch/arm/mach-msm/sec_debug.c
	arch/arm/mach-msm/sec_gaf.c
	arch/arm/mach-msm/sec_getlog.c
	arch/arm/mach-msm/sec_switch.c
	arch/arm/mach-msm/smd_rpc_sym.c
	arch/arm/mm/tlb-v7.S
	arch/arm/vfp/vfpmodule.c
	block/genhd.c
	drivers/Kconfig
	drivers/Makefile
	drivers/base/sync.c
	drivers/bluetooth/Makefile
	drivers/bluetooth/bluesleep_bcm.c
	drivers/bluetooth/btusb.c
	drivers/bluetooth/hci_ibs.c
	drivers/bluetooth/hci_ldisc.c
	drivers/bluetooth/hci_uart.h
	drivers/char/diag/diagchar_core.c
	drivers/char/msm_rotator.c
	drivers/cpufreq/cpufreq.c
	drivers/cpufreq/cpufreq_interactive.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/firmware/dmi_scan.c
	drivers/gpu/ion/ion_carveout_heap.c
	drivers/gpu/ion/msm/msm_ion.c
	drivers/gpu/msm/a3xx_reg.h
	drivers/gpu/msm/adreno.c
	drivers/gpu/msm/adreno.h
	drivers/gpu/msm/adreno_a2xx.c
	drivers/gpu/msm/adreno_a3xx.c
	drivers/gpu/msm/adreno_a3xx_snapshot.c
	drivers/gpu/msm/adreno_a3xx_trace.c
	drivers/gpu/msm/adreno_a3xx_trace.h
	drivers/gpu/msm/adreno_debugfs.c
	drivers/gpu/msm/adreno_debugfs.h
	drivers/gpu/msm/adreno_drawctxt.c
	drivers/gpu/msm/adreno_pm4types.h
	drivers/gpu/msm/adreno_postmortem.c
	drivers/gpu/msm/adreno_postmortem.h
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/adreno_ringbuffer.h
	drivers/gpu/msm/adreno_snapshot.c
	drivers/gpu/msm/kgsl.c
	drivers/gpu/msm/kgsl.h
	drivers/gpu/msm/kgsl_cffdump.c
	drivers/gpu/msm/kgsl_device.h
	drivers/gpu/msm/kgsl_drm.c
	drivers/gpu/msm/kgsl_gpummu.c
	drivers/gpu/msm/kgsl_gpummu.h
	drivers/gpu/msm/kgsl_iommu.c
	drivers/gpu/msm/kgsl_iommu.h
	drivers/gpu/msm/kgsl_mmu.c
	drivers/gpu/msm/kgsl_mmu.h
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/gpu/msm/kgsl_pwrctrl.h
	drivers/gpu/msm/kgsl_pwrscale.c
	drivers/gpu/msm/kgsl_pwrscale.h
	drivers/gpu/msm/kgsl_pwrscale_idlestats.c
	drivers/gpu/msm/kgsl_pwrscale_msm.c
	drivers/gpu/msm/kgsl_pwrscale_trustzone.c
	drivers/gpu/msm/kgsl_sharedmem.c
	drivers/gpu/msm/kgsl_sharedmem.h
	drivers/gpu/msm/kgsl_snapshot.c
	drivers/gpu/msm/kgsl_snapshot.h
	drivers/gpu/msm/kgsl_sync.c
	drivers/gpu/msm/kgsl_trace.h
	drivers/gpu/msm/z180.c
	drivers/hwmon/m_adcproc.c
	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/i2c/chips/fsa9480.c
	drivers/i2c/chips/gp2a_light.c
	drivers/i2c/chips/gp2a_proc.c
	drivers/i2c/chips/gp2a_proximity.c
	drivers/i2c/chips/gp2a_rpc.c
	drivers/i2c/chips/gp2ap020_light.c
	drivers/i2c/chips/gp2ap020_proximity.c
	drivers/i2c/chips/k3g.c
	drivers/i2c/chips/orientation.c
	drivers/i2c/chips/taos.c
	drivers/i2c/chips/wm8994_amp.c
	drivers/i2c/chips/yda165.c
	drivers/i2c/chips/yda165_integ.c
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/input/keyboard/cypress-touchkey.c
	drivers/input/keyboard/cypress-touchkey.h
	drivers/input/keyboard/cypress-touchkey_dali.c
	drivers/input/keyboard/cypress-touchkey_q1_skt.c
	drivers/input/keyboard/issp_defs.h
	drivers/input/keyboard/issp_delays.h
	drivers/input/keyboard/issp_directives.h
	drivers/input/keyboard/issp_driver_routines.c
	drivers/input/keyboard/issp_errors.h
	drivers/input/keyboard/issp_extern.h
	drivers/input/keyboard/issp_main.c
	drivers/input/keyboard/issp_revision.h
	drivers/input/keyboard/issp_routines.c
	drivers/input/keyboard/issp_vectors.h
	drivers/input/keyboard/pmic8xxx-keypad.c
	drivers/input/misc/Makefile
	drivers/input/misc/bmp180.c
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/CeloxHD_V06_bin.c
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/input/touchscreen/OCTA_465_VC57_05_11_bin.c
	drivers/input/touchscreen/mXT540e__APP_V1-2-AA_.h
	drivers/input/touchscreen/mXT540e__APP_V1-3-AA_.h
	drivers/input/touchscreen/mcs8000_download.c
	drivers/input/touchscreen/mcs8000_download.h
	drivers/input/touchscreen/mcs8000_download_porting.h
	drivers/input/touchscreen/melfas_ts.c
	drivers/input/touchscreen/mxt540e_q1.c
	drivers/input/touchscreen/qt602240_ts.c
	drivers/input/touchscreen/wacom_i2c.c
	drivers/input/touchscreen/wacom_i2c_coordX_CCW_LLeft_44.h
	drivers/input/touchscreen/wacom_i2c_coordX_CCW_LLeft_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordX_CCW_LLeft_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coordX_CW_LRight_44.h
	drivers/input/touchscreen/wacom_i2c_coordX_CW_LRight_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordX_CW_LRight_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coordX_LLeft.h
	drivers/input/touchscreen/wacom_i2c_coordX_PLeft.h
	drivers/input/touchscreen/wacom_i2c_coordX_PLeft_44.h
	drivers/input/touchscreen/wacom_i2c_coordX_PLeft_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordX_PLeft_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coordX_PRight.h
	drivers/input/touchscreen/wacom_i2c_coordX_PRight_44.h
	drivers/input/touchscreen/wacom_i2c_coordX_PRight_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordX_PRight_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coordY_CCW_LLeft_44.h
	drivers/input/touchscreen/wacom_i2c_coordY_CCW_LLeft_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordY_CCW_LLeft_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coordY_CW_LRight_44.h
	drivers/input/touchscreen/wacom_i2c_coordY_CW_LRight_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordY_CW_LRight_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coordY_LLeft.h
	drivers/input/touchscreen/wacom_i2c_coordY_PLeft.h
	drivers/input/touchscreen/wacom_i2c_coordY_PLeft_44.h
	drivers/input/touchscreen/wacom_i2c_coordY_PLeft_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordY_PLeft_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coordY_PRight.h
	drivers/input/touchscreen/wacom_i2c_coordY_PRight_44.h
	drivers/input/touchscreen/wacom_i2c_coordY_PRight_44_ATT.h
	drivers/input/touchscreen/wacom_i2c_coordY_PRight_44_KOR.h
	drivers/input/touchscreen/wacom_i2c_coord_table.h
	drivers/input/touchscreen/wacom_i2c_coord_tables.h
	drivers/input/touchscreen/wacom_i2c_firm.c
	drivers/input/touchscreen/wacom_i2c_firm.h
	drivers/input/touchscreen/wacom_i2c_firm_P6_REV02.h
	drivers/input/touchscreen/wacom_i2c_firm_P6_REV03.h
	drivers/input/touchscreen/wacom_i2c_firm_P6_REV04.h
	drivers/input/touchscreen/wacom_i2c_firm_P6_REV05.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_031D.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0331.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0332.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0334.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0335.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0339.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0361.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0364.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0369.h
	drivers/input/touchscreen/wacom_i2c_firm_Q1_KOR4P4_0370.h
	drivers/input/touchscreen/wacom_i2c_flash.c
	drivers/input/touchscreen/wacom_i2c_flash.h
	drivers/input/touchscreen/wacom_i2c_func.c
	drivers/input/touchscreen/wacom_i2c_func.h
	drivers/media/tdmb/Kconfig
	drivers/media/tdmb/Makefile
	drivers/media/tdmb/fc8050/Makefile
	drivers/media/tdmb/fc8050/bbm.c
	drivers/media/tdmb/fc8050/bbm.h
	drivers/media/tdmb/fc8050/dmbdrv_wrap_fc8050.c
	drivers/media/tdmb/fc8050/dmbdrv_wrap_fc8050.h
	drivers/media/tdmb/fc8050/fc8050_bb.c
	drivers/media/tdmb/fc8050/fc8050_bb.h
	drivers/media/tdmb/fc8050/fc8050_i2c.c
	drivers/media/tdmb/fc8050/fc8050_i2c.h
	drivers/media/tdmb/fc8050/fc8050_isr.c
	drivers/media/tdmb/fc8050/fc8050_isr.h
	drivers/media/tdmb/fc8050/fc8050_regs.h
	drivers/media/tdmb/fc8050/fc8050_spi.c
	drivers/media/tdmb/fc8050/fc8050_spi.h
	drivers/media/tdmb/fc8050/fc8050_tun.c
	drivers/media/tdmb/fc8050/fc8050_tun.h
	drivers/media/tdmb/fc8050/fci_hal.c
	drivers/media/tdmb/fc8050/fci_hal.h
	drivers/media/tdmb/fc8050/fci_i2c.c
	drivers/media/tdmb/fc8050/fci_i2c.h
	drivers/media/tdmb/fc8050/fci_oal.c
	drivers/media/tdmb/fc8050/fci_oal.h
	drivers/media/tdmb/fc8050/fci_tun.c
	drivers/media/tdmb/fc8050/fci_tun.h
	drivers/media/tdmb/fc8050/fci_types.h
	drivers/media/tdmb/fc8050/fic.c
	drivers/media/tdmb/fc8050/fic.h
	drivers/media/tdmb/fc8050/ficdecoder.c
	drivers/media/tdmb/fc8050/ficdecoder.h
	drivers/media/tdmb/mtv318/Makefile
	drivers/media/tdmb/mtv318/raontv.c
	drivers/media/tdmb/mtv318/raontv.h
	drivers/media/tdmb/mtv318/raontv_ficdec.c
	drivers/media/tdmb/mtv318/raontv_ficdec.h
	drivers/media/tdmb/mtv318/raontv_ficdec_internal.h
	drivers/media/tdmb/mtv318/raontv_internal.h
	drivers/media/tdmb/mtv318/raontv_port.c
	drivers/media/tdmb/mtv318/raontv_port.h
	drivers/media/tdmb/mtv318/raontv_rf.c
	drivers/media/tdmb/mtv318/raontv_rf.h
	drivers/media/tdmb/mtv318/raontv_rf_adc_data.h
	drivers/media/tdmb/mtv318/raontv_rf_pll_data_tdmb.h
	drivers/media/tdmb/mtv318/raontv_tdmb.c
	drivers/media/tdmb/t3900/INC_FICDEC.c
	drivers/media/tdmb/t3900/INC_INCLUDES.h
	drivers/media/tdmb/t3900/INC_INTERFACE.c
	drivers/media/tdmb/t3900/INC_PROCESS.c
	drivers/media/tdmb/t3900/INC_RF_CTRL500.c
	drivers/media/tdmb/t3900/Makefile
	drivers/media/tdmb/t39f0/INC_FICDEC.c
	drivers/media/tdmb/t39f0/INC_INCLUDES.h
	drivers/media/tdmb/t39f0/INC_INTERFACE.c
	drivers/media/tdmb/t39f0/INC_PROCESS.c
	drivers/media/tdmb/t39f0/INC_RF_CTRL500.c
	drivers/media/tdmb/t39f0/Makefile
	drivers/media/tdmb/tcc3170/Makefile
	drivers/media/tdmb/tcc3170/inc/tcbd_api_common.h
	drivers/media/tdmb/tcc3170/inc/tcbd_diagnosis/tcbd_diagnosis.h
	drivers/media/tdmb/tcc3170/inc/tcbd_drv_io.h
	drivers/media/tdmb/tcc3170/inc/tcbd_drv_ip.h
	drivers/media/tdmb/tcc3170/inc/tcbd_drv_register.h
	drivers/media/tdmb/tcc3170/inc/tcbd_drv_rf.h
	drivers/media/tdmb/tcc3170/inc/tcbd_error.h
	drivers/media/tdmb/tcc3170/inc/tcbd_feature.h
	drivers/media/tdmb/tcc3170/inc/tcbd_hal.h
	drivers/media/tdmb/tcc3170/inc/tcbd_stream_parser/tcbd_stream_parser.h
	drivers/media/tdmb/tcc3170/inc/tcc317x_boot_tdmb.h
	drivers/media/tdmb/tcc3170/inc/tcc_fic_decoder/tcc_fic_decoder.h
	drivers/media/tdmb/tcc3170/inc/tcc_fic_decoder/tcc_fic_fig.h
	drivers/media/tdmb/tcc3170/inc/tcpal/tcpal_debug.h
	drivers/media/tdmb/tcc3170/inc/tcpal/tcpal_os.h
	drivers/media/tdmb/tcc3170/inc/tcpal/tcpal_queue.h
	drivers/media/tdmb/tcc3170/inc/tcpal/tcpal_types.h
	drivers/media/tdmb/tcc3170/src/Makefile
	drivers/media/tdmb/tcc3170/src/tcbd_api_common.c
	drivers/media/tdmb/tcc3170/src/tcbd_diagnosis/Makefile
	drivers/media/tdmb/tcc3170/src/tcbd_diagnosis/tcbd_diagnosis.c
	drivers/media/tdmb/tcc3170/src/tcbd_drv_dual.c
	drivers/media/tdmb/tcc3170/src/tcbd_drv_io.c
	drivers/media/tdmb/tcc3170/src/tcbd_drv_ip.c
	drivers/media/tdmb/tcc3170/src/tcbd_drv_peri.c
	drivers/media/tdmb/tcc3170/src/tcbd_drv_rf.c
	drivers/media/tdmb/tcc3170/src/tcbd_hal.c
	drivers/media/tdmb/tcc3170/src/tcbd_stream_parser/Makefile
	drivers/media/tdmb/tcc3170/src/tcbd_stream_parser/tcbd_stream_parser.c
	drivers/media/tdmb/tcc3170/src/tcc_fic_decoder/Makefile
	drivers/media/tdmb/tcc3170/src/tcc_fic_decoder/tcc_fic_decoder.c
	drivers/media/tdmb/tcc3170/src/tcc_fic_decoder/tcc_fic_fig0.c
	drivers/media/tdmb/tcc3170/src/tcc_fic_decoder/tcc_fic_fig1.c
	drivers/media/tdmb/tcc3170/src/tcpal_linux/Makefile
	drivers/media/tdmb/tcc3170/src/tcpal_linux/tcpal_debug.c
	drivers/media/tdmb/tcc3170/src/tcpal_linux/tcpal_io_cspi.c
	drivers/media/tdmb/tcc3170/src/tcpal_linux/tcpal_io_i2c.c
	drivers/media/tdmb/tcc3170/src/tcpal_linux/tcpal_irq_handler.c
	drivers/media/tdmb/tcc3170/src/tcpal_linux/tcpal_linux.c
	drivers/media/tdmb/tcc3170/src/tcpal_linux/tcpal_queue.c
	drivers/media/tdmb/tdmb.c
	drivers/media/tdmb/tdmb.h
	drivers/media/tdmb/tdmb_data.c
	drivers/media/tdmb/tdmb_ebi.c
	drivers/media/tdmb/tdmb_port_fc8050.c
	drivers/media/tdmb/tdmb_port_mtv318.c
	drivers/media/tdmb/tdmb_port_t3900.c
	drivers/media/tdmb/tdmb_port_tcc3170.c
	drivers/media/tdmb/tdmb_spi.c
	drivers/media/video/msm/gemini/msm_gemini_common.h
	drivers/media/video/msm/ledflash_torch.c
	drivers/media/video/msm/msm_camera.c
	drivers/media/video/msm/msm_io_8x60.c
	drivers/media/video/msm/sec_apex_pmic.c
	drivers/media/video/msm/sec_apex_pmic.h
	drivers/media/video/msm/sec_cam_dev.h
	drivers/media/video/msm/sec_cam_pmic.c
	drivers/media/video/msm/sec_cam_pmic.h
	drivers/media/video/msm/sec_isx012.c
	drivers/media/video/msm/sec_isx012.h
	drivers/media/video/msm/sec_isx012_reg.h
	drivers/media/video/msm/sec_m5mo.c
	drivers/media/video/msm/sec_m5mo.h
	drivers/media/video/msm/sec_s5k5bafx.c
	drivers/media/video/msm/sec_s5k5bafx.h
	drivers/media/video/msm/sec_s5k5bafx_reg.h
	drivers/media/video/msm/sec_s5k5bafx_reg_dali.h
	drivers/media/video/msm/sec_s5k5bafx_reg_q1.h
	drivers/media/video/msm/sec_s5k5bafx_reg_tmo.h
	drivers/media/video/msm/sec_s5k6aafx.c
	drivers/media/video/msm/sec_s5k6aafx.h
	drivers/media/video/msm/sec_s5k6aafx_reg.h
	drivers/media/video/msm/sec_sr200pc20m.c
	drivers/media/video/msm/sec_sr200pc20m.h
	drivers/media/video/msm/sec_sr200pc20m_reg.h
	drivers/mfd/marimba-core.c
	drivers/mfd/pm8xxx-irq.c
	drivers/mfd/pmic8901.c
	drivers/mfd/timpani-codec.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/a2220.c
	drivers/misc/a2220_firmware.h
	drivers/misc/a2220b.c
	drivers/misc/a2220b_cmd.h
	drivers/misc/a2220b_cmd_A2.h
	drivers/misc/a2220b_cmd_Q1.h
	drivers/misc/ak8975-reg.h
	drivers/misc/ak8975.c
	drivers/misc/k3dh.c
	drivers/misc/k3dh_reg.h
	drivers/misc/pmic8058-xoadc.c
	drivers/misc/sec_earjack.c
	drivers/misc/sec_jack.c
	drivers/misc/sec_level.c
	drivers/misc/sec_misc.c
	drivers/misc/sec_param.c
	drivers/misc/stmpe811.c
	drivers/misc/vibetonz/ImmVibeSPI.c
	drivers/misc/vibetonz/Makefile
	drivers/misc/vibetonz/VibeOSKernelLinuxHRTime.c
	drivers/misc/vibetonz/VibeOSKernelLinuxTime.c
	drivers/misc/vibetonz/tspdrv.c
	drivers/misc/vibetonz/tspdrv.h
	drivers/mmc/host/msm_sdcc.c
	drivers/net/msm_rmnet_sdio.c
	drivers/net/wireless/Makefile
	drivers/net/wireless/bcmdhd/dhd.h
	drivers/net/wireless/bcmdhd/dhd_linux.c
	drivers/net/wireless/bcmdhd/wl_cfg80211.c
	drivers/net/wireless/bcmdhd/wl_cfgp2p.c
	drivers/net/wireless/p54/p54usb.c
	drivers/net/xen-netback/netback.c
	drivers/nfc/pn544.c
	drivers/power/Kconfig
	drivers/power/Makefile
	drivers/power/max17040_battery.c
	drivers/power/max17042_battery.c
	drivers/power/sec_battery.c
	drivers/power/smb328a_charger.c
	drivers/scsi/sd.c
	drivers/staging/android/logger.c
	drivers/usb/core/hub.c
	drivers/usb/core/sec_whitelist.h
	drivers/usb/gadget/android.c
	drivers/usb/gadget/composite.c
	drivers/usb/gadget/f_acm.c
	drivers/usb/gadget/f_diag.c
	drivers/usb/gadget/f_mtp.h
	drivers/usb/gadget/f_mtp_samsung.c
	drivers/usb/gadget/f_rmnet.c
	drivers/usb/gadget/msm72k_udc.c
	drivers/usb/gadget/multi_config.c
	drivers/usb/gadget/multi_config.h
	drivers/usb/gadget/serial_acm.c
	drivers/usb/host/ehci-msm72k.c
	drivers/usb/notify/Kconfig
	drivers/usb/notify/Makefile
	drivers/usb/notify/host_notify_class.c
	drivers/usb/otg/msm72k_otg.c
	drivers/usb/serial/option.c
	drivers/video/Kconfig
	drivers/video/console/fbcon.c
	drivers/video/msm/Kconfig
	drivers/video/msm/Makefile
	drivers/video/msm/ea8868_volt_tbl.h
	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/lcdc_S6E63M0.c
	drivers/video/msm/lcdc_S6E63M0_seq.h
	drivers/video/msm/lcdc_ea8868_seq.h
	drivers/video/msm/lcdc_ld9040.c
	drivers/video/msm/lcdc_ld9040_seq.h
	drivers/video/msm/logo.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	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/mdp4_overlay_lcdc.c
	drivers/video/msm/mdp4_overlay_mddi.c
	drivers/video/msm/mdp4_util.c
	drivers/video/msm/mdp4_video_enhance.c
	drivers/video/msm/mdp4_video_enhance.h
	drivers/video/msm/mdp4_video_tuning.h
	drivers/video/msm/mdp4_video_tuning_HD720.h
	drivers/video/msm/mdp4_video_tuning_Q1.h
	drivers/video/msm/mdp_dma.c
	drivers/video/msm/mdp_dma_dsi_video.c
	drivers/video/msm/mdp_dma_lcdc.c
	drivers/video/msm/mdp_hw_init.c
	drivers/video/msm/mhl_v2/Kconfig
	drivers/video/msm/mhl_v2/Makefile
	drivers/video/msm/mhl_v2/sii9234.c
	drivers/video/msm/mhl_v2/sii9234_driver.h
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/mipi_s6e8aa0_hd720.c
	drivers/video/msm/mipi_s6e8aa0_hd720.h
	drivers/video/msm/mipi_s6e8aa0_hd720_pt.c
	drivers/video/msm/mipi_s6e8aa0_hd720_seq.h
	drivers/video/msm/mipi_s6e8aa0_wxga_q1.c
	drivers/video/msm/mipi_s6e8aa0_wxga_q1.h
	drivers/video/msm/mipi_s6e8aa0_wxga_q1_pt.c
	drivers/video/msm/mipi_s6e8aa0_wxga_q1_seq.h
	drivers/video/msm/mipi_tc358764_dsi2lvds.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	drivers/video/msm/s6e8aa0_volt_tbl.h
	drivers/video/msm/s6ea8868_volt_tbl.h
	drivers/video/msm/sec_mipi_lcd_esd_refresh.c
	drivers/video/msm/smart_dimming.c
	drivers/video/msm/smart_dimming.h
	drivers/video/msm/smart_dimming_ea8868.c
	drivers/video/msm/smart_dimming_ea8868.h
	drivers/video/msm/smart_mtp_2p2_gamma.h
	drivers/video/msm/smart_mtp_s6e63m0.c
	drivers/video/msm/smart_mtp_s6e63m0.h
	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
	fs/ecryptfs/Kconfig
	fs/ecryptfs/ecryptfs_kernel.h
	fs/ecryptfs/file.c
	fs/ecryptfs/inode.c
	fs/ecryptfs/main.c
	fs/ecryptfs/super.c
	fs/fat/dir.c
	include/linux/a2220.h
	include/linux/cpu.h
	include/linux/cpufreq.h
	include/linux/host_notify.h
	include/linux/i2c/ak8975.h
	include/linux/i2c/fsa9480.h
	include/linux/i2c/gp2a.h
	include/linux/i2c/gp2ap020.h
	include/linux/i2c/k3dh.h
	include/linux/i2c/k3g.h
	include/linux/i2c/mxt224_celox.h
	include/linux/i2c/mxt540e_q1.h
	include/linux/i2c/qt602240_ts.h
	include/linux/i2c/taos.h
	include/linux/i2c/wm8994_amp.h
	include/linux/i2c/yda165.h
	include/linux/i2c/yda165_integ.h
	include/linux/input.h
	include/linux/max17040_battery.h
	include/linux/melfas_ts.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_kgsl.h
	include/linux/msm_mdp.h
	include/linux/msm_rotator.h
	include/linux/msm_vidc_dec.h
	include/linux/nl80211.h
	include/linux/pmic8058-xoadc.h
	include/linux/power/max17042_battery.h
	include/linux/sec_earjack.h
	include/linux/sec_jack.h
	include/linux/sec_param.h
	include/linux/sii9234.h
	include/linux/sii9234_rcp.h
	include/linux/smb328a_charger.h
	include/linux/usb/composite.h
	include/linux/usb/hcd.h
	include/linux/usb/msm_hsusb.h
	include/linux/video/sec_mipi_lcd_esd_refresh.h
	include/linux/wacom_i2c.h
	include/media/msm_camera.h
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/bluetooth/mgmt.h
	include/net/bluetooth/sco.h
	include/net/cfg80211.h
	init/main.c
	kernel/power/earlysuspend.c
	kernel/power/main.c
	kernel/power/wakelock.c
	kernel/printk.c
	kernel/sched.c
	kernel/trace/ftrace.c
	mm/compaction.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/hci_sock.c
	net/bluetooth/hidp/core.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
	net/bluetooth/sco.c
	net/bluetooth/smp.c
	scripts/Kbuild.include
	sound/soc/msm/msm-lowlatency-pcm-q6.c
	sound/soc/msm/msm8x60.c

'merge'