Auto-merging sound/soc/soc-dapm.c
Auto-merging sound/soc/msm/qdsp6v2/q6asm.c
CONFLICT (content): Merge conflict in sound/soc/msm/qdsp6v2/q6asm.c
Auto-merging sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c
Auto-merging sound/soc/msm/qdsp6v2/msm-dai-q6-v2.c
Auto-merging sound/soc/msm/msm8x10.c
Auto-merging sound/soc/msm/msm8974.c
CONFLICT (content): Merge conflict in sound/soc/msm/msm8974.c
Auto-merging sound/soc/msm/msm8226.c
CONFLICT (content): Merge conflict in sound/soc/msm/msm8226.c
Auto-merging sound/soc/msm/msm-dai-fe.c
Auto-merging sound/soc/codecs/wcd9320.c
Auto-merging sound/soc/codecs/wcd9306.c
Auto-merging sound/soc/codecs/tpa6165a2.c
CONFLICT (add/add): Merge conflict in sound/soc/codecs/tpa6165a2.c
Auto-merging sound/soc/codecs/tfa9890.c
CONFLICT (add/add): Merge conflict in sound/soc/codecs/tfa9890.c
Auto-merging sound/soc/codecs/msm8x10-wcd.c
Auto-merging security/selinux/hooks.c
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Auto-merging net/wireless/reg.c
Auto-merging net/wireless/db.txt
Auto-merging mm/compaction.c
CONFLICT (content): Merge conflict in mm/compaction.c
Auto-merging include/sound/tfa9890.h
CONFLICT (add/add): Merge conflict in include/sound/tfa9890.h
Auto-merging include/media/msm_cam_sensor.h
CONFLICT (content): Merge conflict in include/media/msm_cam_sensor.h
Auto-merging include/linux/tpa6165a2.h
CONFLICT (add/add): Merge conflict in include/linux/tpa6165a2.h
Auto-merging include/linux/stm401.h
CONFLICT (add/add): Merge conflict in include/linux/stm401.h
Auto-merging include/linux/qpnp/qpnp-adc.h
Auto-merging include/linux/platform_data/lm3630a_bl.h
CONFLICT (add/add): Merge conflict in include/linux/platform_data/lm3630a_bl.h
CONFLICT (rename/delete): include/linux/mot_patch.h deleted in HEAD and renamed in moto/kitkat-4.4.4-release-titan. Version moto/kitkat-4.4.4-release-titan of include/linux/mot_patch.h left in tree.
Auto-merging include/linux/mmc/host.h
CONFLICT (content): Merge conflict in include/linux/mmc/host.h
Auto-merging include/linux/mmc/card.h
CONFLICT (content): Merge conflict in include/linux/mmc/card.h
Auto-merging include/linux/magic.h
Auto-merging include/linux/i2c/atmel_mxt_ts_mmi.h
CONFLICT (add/add): Merge conflict in include/linux/i2c/atmel_mxt_ts_mmi.h
Auto-merging include/linux/fb.h
Auto-merging include/linux/bmg160.h
CONFLICT (add/add): Merge conflict in include/linux/bmg160.h
Auto-merging fs/open.c
Auto-merging fs/namespace.c
Auto-merging fs/namei.c
Auto-merging fs/f2fs/recovery.c
CONFLICT (add/add): Merge conflict in fs/f2fs/recovery.c
Auto-merging fs/f2fs/namei.c
CONFLICT (add/add): Merge conflict in fs/f2fs/namei.c
Auto-merging fs/f2fs/f2fs.h
CONFLICT (add/add): Merge conflict in fs/f2fs/f2fs.h
Auto-merging fs/f2fs/dir.c
CONFLICT (add/add): Merge conflict in fs/f2fs/dir.c
Auto-merging fs/Makefile
Auto-merging fs/Kconfig
Auto-merging drivers/video/msm/mdss/msm_mdss_io_8974.c
Auto-merging drivers/video/msm/mdss/mmi_panel_notifier.c
CONFLICT (add/add): Merge conflict in drivers/video/msm/mdss/mmi_panel_notifier.c
Auto-merging drivers/video/msm/mdss/mdss_panel.h
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_panel.h
Auto-merging drivers/video/msm/mdss/mdss_mdp_pipe.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_mdp_pipe.c
Auto-merging drivers/video/msm/mdss/mdss_mdp_overlay.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_mdp_overlay.c
Auto-merging drivers/video/msm/mdss/mdss_mdp_intf_video.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_mdp_intf_video.c
Auto-merging drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_mdp_intf_cmd.c
Auto-merging drivers/video/msm/mdss/mdss_mdp_hwio.h
Auto-merging drivers/video/msm/mdss/mdss_mdp_ctl.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_mdp_ctl.c
Auto-merging drivers/video/msm/mdss/mdss_mdp.h
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_mdp.h
Auto-merging drivers/video/msm/mdss/mdss_mdp.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_mdp.c
Auto-merging drivers/video/msm/mdss/mdss_fb.h
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_fb.h
Auto-merging drivers/video/msm/mdss/mdss_fb.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_fb.c
Auto-merging drivers/video/msm/mdss/mdss_dsi_status.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_dsi_status.c
Auto-merging drivers/video/msm/mdss/mdss_dsi_panel.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_dsi_panel.c
Auto-merging drivers/video/msm/mdss/mdss_dsi_host.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_dsi_host.c
Auto-merging drivers/video/msm/mdss/mdss_dsi.h
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_dsi.h
Auto-merging drivers/video/msm/mdss/mdss_dsi.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss_dsi.c
Auto-merging drivers/video/msm/mdss/mdss.h
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdss.h
Auto-merging drivers/video/msm/mdss/mdp3_dma.h
Auto-merging drivers/video/msm/mdss/mdp3_dma.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdp3_dma.c
Auto-merging drivers/video/msm/mdss/mdp3_ctrl.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/mdp3_ctrl.c
Auto-merging drivers/video/msm/mdss/dsi_v2.c
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/dsi_v2.c
Auto-merging drivers/video/msm/mdss/dsi_status_v2.c
Auto-merging drivers/video/msm/mdss/dsi_host_v2.c
Auto-merging drivers/video/msm/mdss/Makefile
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/Makefile
Auto-merging drivers/video/msm/mdss/Kconfig
CONFLICT (content): Merge conflict in drivers/video/msm/mdss/Kconfig
Auto-merging drivers/video/fbmem.c
Auto-merging drivers/video/backlight/lm3630a_bl.c
CONFLICT (add/add): Merge conflict in drivers/video/backlight/lm3630a_bl.c
Auto-merging drivers/usb/otg/msm_otg.c
CONFLICT (content): Merge conflict in drivers/usb/otg/msm_otg.c
Auto-merging drivers/usb/gadget/f_mtp.c
Auto-merging drivers/usb/dwc3/gadget.c
Auto-merging drivers/usb/dwc3/dwc3_otg.h
CONFLICT (content): Merge conflict in drivers/usb/dwc3/dwc3_otg.h
Auto-merging drivers/usb/dwc3/dwc3_otg.c
Auto-merging drivers/usb/dwc3/dwc3-msm.c
Auto-merging drivers/usb/dwc3/core.c
Auto-merging drivers/tty/serial/msm_serial_hs.c
CONFLICT (content): Merge conflict in drivers/tty/serial/msm_serial_hs.c
Auto-merging drivers/thermal/thermal_sys.c
Auto-merging drivers/thermal/qpnp-adc-tm.c
Auto-merging drivers/thermal/msm_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/msm_thermal.c
Auto-merging drivers/staging/android/lowmemorykiller.c
CONFLICT (content): Merge conflict in drivers/staging/android/lowmemorykiller.c
Auto-merging drivers/staging/android/ashmem.c
CONFLICT (content): Merge conflict in drivers/staging/android/ashmem.c
Auto-merging drivers/rtc/qpnp-rtc.c
Auto-merging drivers/power/qpnp-charger.c
CONFLICT (content): Merge conflict in drivers/power/qpnp-charger.c
Auto-merging drivers/power/qpnp-bms.c
CONFLICT (content): Merge conflict in drivers/power/qpnp-bms.c
Auto-merging drivers/power/power_supply_sysfs.c
Auto-merging drivers/power/Makefile
Auto-merging drivers/power/Kconfig
CONFLICT (content): Merge conflict in drivers/power/Kconfig
Auto-merging drivers/platform/msm/qpnp-power-on.c
CONFLICT (content): Merge conflict in drivers/platform/msm/qpnp-power-on.c
Auto-merging drivers/platform/msm/ipa/ipa_intf.c
CONFLICT (content): Merge conflict in drivers/platform/msm/ipa/ipa_intf.c
Auto-merging drivers/of/of_batterydata.c
Auto-merging drivers/net/wireless/wcnss/wcnss_wlan.c
Auto-merging drivers/mmc/host/sdhci.h
Auto-merging drivers/mmc/host/sdhci.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci.c
Auto-merging drivers/mmc/host/sdhci-msm.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-msm.c
Auto-merging drivers/mmc/host/msm_sdcc.c
CONFLICT (content): Merge conflict in drivers/mmc/host/msm_sdcc.c
Auto-merging drivers/mmc/core/sd.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sd.c
Auto-merging drivers/mmc/core/mmc.c
Auto-merging drivers/mmc/core/host.c
Auto-merging drivers/mmc/core/debugfs.c
Auto-merging drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
Auto-merging drivers/mmc/core/cd-gpio.c
CONFLICT (content): Merge conflict in drivers/mmc/core/cd-gpio.c
Auto-merging drivers/mmc/card/block.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Auto-merging drivers/misc/stm401/stm401_wake_irq.c
CONFLICT (add/add): Merge conflict in drivers/misc/stm401/stm401_wake_irq.c
Auto-merging drivers/misc/stm401/stm401_reset.c
CONFLICT (add/add): Merge conflict in drivers/misc/stm401/stm401_reset.c
Auto-merging drivers/misc/stm401/stm401_irq.c
CONFLICT (add/add): Merge conflict in drivers/misc/stm401/stm401_irq.c
Auto-merging drivers/misc/stm401/stm401_ioctl.c
CONFLICT (add/add): Merge conflict in drivers/misc/stm401/stm401_ioctl.c
Auto-merging drivers/misc/stm401/stm401_flash.c
CONFLICT (add/add): Merge conflict in drivers/misc/stm401/stm401_flash.c
Auto-merging drivers/misc/stm401/stm401_core.c
CONFLICT (add/add): Merge conflict in drivers/misc/stm401/stm401_core.c
Auto-merging drivers/misc/stm401/Makefile
CONFLICT (add/add): Merge conflict in drivers/misc/stm401/Makefile
Auto-merging drivers/misc/qseecom.c
Auto-merging drivers/misc/mmi-factory.c
CONFLICT (add/add): Merge conflict in drivers/misc/mmi-factory.c
Auto-merging drivers/misc/drv2605.c
CONFLICT (add/add): Merge conflict in drivers/misc/drv2605.c
Auto-merging drivers/misc/bmm050.c
CONFLICT (add/add): Merge conflict in drivers/misc/bmm050.c
Auto-merging drivers/misc/bmg160_driver.c
CONFLICT (add/add): Merge conflict in drivers/misc/bmg160_driver.c
Auto-merging drivers/misc/bmg160.c
CONFLICT (add/add): Merge conflict in drivers/misc/bmg160.c
Auto-merging drivers/misc/bma2x2.c
CONFLICT (add/add): Merge conflict in drivers/misc/bma2x2.c
Auto-merging drivers/misc/apanic_mmc.c
CONFLICT (add/add): Merge conflict in drivers/misc/apanic_mmc.c
Auto-merging drivers/misc/akm8963.c
CONFLICT (add/add): Merge conflict in drivers/misc/akm8963.c
Auto-merging drivers/media/platform/msm/vidc/vidc_hfi_api.h
Auto-merging drivers/media/platform/msm/vidc/msm_vidc_internal.h
Auto-merging drivers/media/platform/msm/vidc/msm_vidc_common.c
Auto-merging drivers/media/platform/msm/vidc/msm_vidc.c
Auto-merging drivers/media/platform/msm/vidc/msm_venc.c
Auto-merging drivers/media/platform/msm/vidc/msm_vdec.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
CONFLICT (content): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/msm_sensor.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/imx179.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/imx179.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/imx135.c
CONFLICT (content): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/imx135.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/imx132.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/imx132.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_i2c_trigger.c
CONFLICT (content): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_i2c_trigger.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.h
CONFLICT (content): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/flash/msm_led_flash.h
Auto-merging drivers/media/platform/msm/camera_v2/sensor/flash/lm3646.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/flash/lm3646.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/flash/Makefile
CONFLICT (content): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/flash/Makefile
Auto-merging drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c
Auto-merging drivers/media/platform/msm/camera_v2/sensor/ar0261.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/sensor/ar0261.c
Auto-merging drivers/media/platform/msm/camera_v2/msm.c
CONFLICT (content): Merge conflict in drivers/media/platform/msm/camera_v2/msm.c
Auto-merging drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c
Auto-merging drivers/media/platform/msm/camera_v2/cci_intf.c
CONFLICT (add/add): Merge conflict in drivers/media/platform/msm/camera_v2/cci_intf.c
Auto-merging drivers/leds/Kconfig
Auto-merging drivers/input/touchscreen/synaptics_dsx_i2c.c
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/synaptics_dsx_i2c.c
Auto-merging drivers/input/touchscreen/atmel_mxt_ts_mmi.c
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/atmel_mxt_ts_mmi.c
Auto-merging drivers/input/touchscreen/aps_ts.c
CONFLICT (add/add): Merge conflict in drivers/input/touchscreen/aps_ts.c
Auto-merging drivers/input/touchscreen/Makefile
CONFLICT (content): Merge conflict in drivers/input/touchscreen/Makefile
Auto-merging drivers/input/touchscreen/Kconfig
Auto-merging drivers/input/misc/vfsSpiDrv.c
CONFLICT (add/add): Merge conflict in drivers/input/misc/vfsSpiDrv.c
Auto-merging drivers/input/misc/stk3x1x_moto.c
CONFLICT (add/add): Merge conflict in drivers/input/misc/stk3x1x_moto.c
Auto-merging drivers/input/misc/ct406.c
CONFLICT (add/add): Merge conflict in drivers/input/misc/ct406.c
Auto-merging drivers/i2c/busses/i2c-qup.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-qup.c
Auto-merging drivers/hwmon/qpnp-adc-voltage.c
Auto-merging drivers/hwmon/qpnp-adc-common.c
CONFLICT (content): Merge conflict in drivers/hwmon/qpnp-adc-common.c
Auto-merging drivers/gpu/msm/kgsl_snapshot.c
Auto-merging drivers/gpu/msm/kgsl_sharedmem.c
Auto-merging drivers/gpu/msm/kgsl_mmu.c
Auto-merging drivers/gpu/msm/kgsl_iommu.c
CONFLICT (content): Merge conflict in drivers/gpu/msm/kgsl_iommu.c
Auto-merging drivers/gpu/msm/adreno_ringbuffer.c
Auto-merging drivers/gpu/msm/adreno_dispatch.c
Auto-merging drivers/gpu/msm/adreno_a3xx.c
CONFLICT (content): Merge conflict in drivers/gpu/msm/adreno_a3xx.c
Auto-merging drivers/gpu/msm/adreno.h
Auto-merging drivers/gpu/msm/adreno.c
Auto-merging drivers/gpu/ion/ion_cma_secure_heap.c
Auto-merging arch/arm/mm/mmu.c
Auto-merging arch/arm/mm/dma-mapping.c
Auto-merging arch/arm/mach-msm/subsystem_restart.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/subsystem_restart.c
Auto-merging arch/arm/mach-msm/socinfo.c
Auto-merging arch/arm/mach-msm/smd.c
Auto-merging arch/arm/mach-msm/pm_debug.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/pm_debug.c
Auto-merging arch/arm/mach-msm/pil-q6v5-mss.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/pil-q6v5-mss.c
Auto-merging arch/arm/mach-msm/msm_bus/msm_bus_of.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/msm_bus/msm_bus_of.c
Auto-merging arch/arm/mach-msm/msm-pm.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/msm-pm.c
Auto-merging arch/arm/mach-msm/mmi-unit-info.h
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/mmi-unit-info.h
Auto-merging arch/arm/mach-msm/mmi-unit-info.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/mmi-unit-info.c
Auto-merging arch/arm/mach-msm/memutils/memcpy.S
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/memutils/memcpy.S
Auto-merging arch/arm/mach-msm/memutils/copy_to_user.S
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/memutils/copy_to_user.S
Auto-merging arch/arm/mach-msm/memutils/copy_from_user.S
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/memutils/copy_from_user.S
Auto-merging arch/arm/mach-msm/memutils/Makefile
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/memutils/Makefile
Auto-merging arch/arm/mach-msm/lpm_levels.c
Auto-merging arch/arm/mach-msm/include/mach/socinfo.h
Auto-merging arch/arm/mach-msm/include/mach/msm_smem.h
Auto-merging arch/arm/mach-msm/include/mach/mmi_panel_notifier.h
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/include/mach/mmi_panel_notifier.h
Auto-merging arch/arm/mach-msm/include/mach/board.h
Auto-merging arch/arm/mach-msm/cpr-regulator.c
Auto-merging arch/arm/mach-msm/clock-krait-8974.c
Auto-merging arch/arm/mach-msm/clock-8974.c
Auto-merging arch/arm/mach-msm/clock-8610.c
Auto-merging arch/arm/mach-msm/clock-8226.c
Auto-merging arch/arm/mach-msm/board-8974-moto-gpiomux.c
CONFLICT (add/add): Merge conflict in arch/arm/mach-msm/board-8974-moto-gpiomux.c
Auto-merging arch/arm/mach-msm/Makefile.boot
CONFLICT (content): Merge conflict in arch/arm/mach-msm/Makefile.boot
Auto-merging arch/arm/mach-msm/Makefile
Auto-merging arch/arm/mach-msm/Kconfig
Auto-merging arch/arm/lib/Makefile
CONFLICT (content): Merge conflict in arch/arm/lib/Makefile
Auto-merging arch/arm/kernel/setup.c
Auto-merging arch/arm/include/asm/bootinfo.h
CONFLICT (add/add): Merge conflict in arch/arm/include/asm/bootinfo.h
Auto-merging arch/arm/configs/msm8974_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/msm8974_defconfig
Auto-merging arch/arm/configs/msm8974-perf_defconfig
Auto-merging arch/arm/configs/msm8610_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/msm8610_defconfig
Auto-merging arch/arm/configs/msm8610-perf_defconfig
Auto-merging arch/arm/configs/msm8226_defconfig
CONFLICT (content): Merge conflict in arch/arm/configs/msm8226_defconfig
Auto-merging arch/arm/configs/msm8226-perf_defconfig
Auto-merging arch/arm/configs/ext_config/debug-msm8974.config
CONFLICT (add/add): Merge conflict in arch/arm/configs/ext_config/debug-msm8974.config
Auto-merging arch/arm/configs/ext_config/debug-msm8226.config
CONFLICT (add/add): Merge conflict in arch/arm/configs/ext_config/debug-msm8226.config
Auto-merging arch/arm/configs/apq8084_defconfig
Auto-merging arch/arm/boot/dts/msm8974pro.dtsi
Auto-merging arch/arm/boot/dts/msm8974pro-victara-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-victara-common.dtsi
Auto-merging arch/arm/boot/dts/msm8974pro-valocia-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-valocia-common.dtsi
Auto-merging arch/arm/boot/dts/msm8974pro-moto-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-moto-common.dtsi
Auto-merging arch/arm/boot/dts/msm8974pro-ac-victara-p1b.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ac-victara-p1b.dts
Auto-merging arch/arm/boot/dts/msm8974pro-ac-moto-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ac-moto-common.dtsi
Auto-merging arch/arm/boot/dts/msm8974pro-ac-abbagoochie-p4.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ac-abbagoochie-p4.dts
Auto-merging arch/arm/boot/dts/msm8974pro-abbagoochie-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-abbagoochie-common.dtsi
Auto-merging arch/arm/boot/dts/msm8974pro-ab-victara-p1b.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ab-victara-p1b.dts
Auto-merging arch/arm/boot/dts/msm8974pro-ab-victara-p0.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ab-victara-p0.dts
Auto-merging arch/arm/boot/dts/msm8974pro-ab-valocia-p0.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ab-valocia-p0.dts
Auto-merging arch/arm/boot/dts/msm8974pro-ab-abbagoochie-p3.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ab-abbagoochie-p3.dts
Auto-merging arch/arm/boot/dts/msm8974pro-ab-abbagoochie-p2.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974pro-ab-abbagoochie-p2.dts
Auto-merging arch/arm/boot/dts/msm8974.dtsi
Auto-merging arch/arm/boot/dts/msm8974-v2-moto-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974-v2-moto-common.dtsi
Auto-merging arch/arm/boot/dts/msm8974-mdss.dtsi
Auto-merging arch/arm/boot/dts/msm8974-camera-sensor-moto.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8974-camera-sensor-moto.dtsi
Auto-merging arch/arm/boot/dts/msm8926.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/msm8926.dtsi
Auto-merging arch/arm/boot/dts/msm8926-peregrine-p2d.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8926-peregrine-p2d.dts
CONFLICT (rename/rename): Rename "arch/arm/mach-msm/board-msm7x30-regulator.h"->"arch/arm/boot/dts/msm8926-peregrine-p2a1.dts" in branch "HEAD" rename "arch/arm/mach-msm/board-msm7x30-regulator.h"->"arch/arm/boot/dts/msm8226-bigfoot-p1.dts" in "moto/kitkat-4.4.4-release-titan"
Auto-merging arch/arm/boot/dts/msm8926-peregrine-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8926-peregrine-common.dtsi
Auto-merging arch/arm/boot/dts/msm8610.dtsi
Auto-merging arch/arm/boot/dts/msm8610-v2-pm.dtsi
Auto-merging arch/arm/boot/dts/msm8610-v1-pm.dtsi
Auto-merging arch/arm/boot/dts/msm8610-moto-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-moto-common.dtsi
Auto-merging arch/arm/boot/dts/msm8610-condor-p2b1.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p2b1.dts
Auto-merging arch/arm/boot/dts/msm8610-condor-p2b.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p2b.dts
CONFLICT (rename/rename): Rename "arch/arm/mach-msm/board-msm7627-regulator.h"->"arch/arm/boot/dts/msm8610-condor-p2a1.dts" in branch "HEAD" rename "arch/arm/mach-msm/board-msm7627-regulator.h"->"include/linux/i2c/i2c-qup.h" in "moto/kitkat-4.4.4-release-titan"
CONFLICT (rename/rename): Rename "arch/arm/mach-msm/board-msm7x27a-regulator.h"->"arch/arm/boot/dts/msm8610-condor-p2.dts" in branch "HEAD" rename "arch/arm/mach-msm/board-msm7x27a-regulator.h"->"arch/arm/boot/dts/msm8926-peregrine-p2a1.dts" in "moto/kitkat-4.4.4-release-titan"
Auto-merging arch/arm/boot/dts/msm8610-condor-p1c.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p1c.dts
Auto-merging arch/arm/boot/dts/msm8610-condor-p1c-v2.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p1c-v2.dts
Auto-merging arch/arm/boot/dts/msm8610-condor-p1b.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p1b.dts
Auto-merging arch/arm/boot/dts/msm8610-condor-p1b-v2.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p1b-v2.dts
Auto-merging arch/arm/boot/dts/msm8610-condor-p0c.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p0c.dts
Auto-merging arch/arm/boot/dts/msm8610-condor-p0c-v2.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p0c-v2.dts
Auto-merging arch/arm/boot/dts/msm8610-condor-p0.dts
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8610-condor-p0.dts
Auto-merging arch/arm/boot/dts/msm8226.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/msm8226.dtsi
Auto-merging arch/arm/boot/dts/msm8226-v2.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/msm8226-v2.dtsi
Auto-merging arch/arm/boot/dts/msm8226-v2-pm.dtsi
Auto-merging arch/arm/boot/dts/msm8226-v1-pm.dtsi
Auto-merging arch/arm/boot/dts/msm8226-titan-gpiomux.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8226-titan-gpiomux.dtsi
Auto-merging arch/arm/boot/dts/msm8226-titan-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8226-titan-common.dtsi
Auto-merging arch/arm/boot/dts/msm8226-regulator.dtsi
Auto-merging arch/arm/boot/dts/msm8226-moto-common.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8226-moto-common.dtsi
Auto-merging arch/arm/boot/dts/msm8226-mdss.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/msm8226-mdss.dtsi
Auto-merging arch/arm/boot/dts/msm8226-camera-sensor-titan.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/msm8226-camera-sensor-titan.dtsi
CONFLICT (rename/rename): Rename "arch/arm/mach-msm/include/mach/msm_i2ckbd.h"->"arch/arm/boot/dts/msm8226-bigfoot-p1.dts" in branch "HEAD" rename "arch/arm/mach-msm/include/mach/msm_i2ckbd.h"->"drivers/video/msm/mdss/mdss_quickdraw.h" in "moto/kitkat-4.4.4-release-titan"
Auto-merging arch/arm/boot/dts/msm-pm8226.dtsi
Auto-merging arch/arm/boot/dts/dsi-panel-mot-smd-720p-cmd.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/dsi-panel-mot-smd-720p-cmd.dtsi
Auto-merging arch/arm/boot/dts/dsi-panel-mot-smd-598-1080p-cmd.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/dsi-panel-mot-smd-598-1080p-cmd.dtsi
Auto-merging arch/arm/boot/dts/dsi-panel-mot-smd-1080p-cmd.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/dsi-panel-mot-smd-1080p-cmd.dtsi
Auto-merging arch/arm/boot/dts/dsi-panel-mot-lgd-720p-video.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/dsi-panel-mot-lgd-720p-video.dtsi
Auto-merging arch/arm/boot/dts/dsi-panel-mot-jdi-720p-video.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/dsi-panel-mot-jdi-720p-video.dtsi
Auto-merging arch/arm/boot/dts/dsi-panel-mot-inx-720p-video.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/dsi-panel-mot-inx-720p-video.dtsi
Auto-merging arch/arm/boot/dts/dsi-panel-mot-cmi-720p-video.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/dsi-panel-mot-cmi-720p-video.dtsi
Auto-merging arch/arm/boot/dts/carrier-channel-ids.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/carrier-channel-ids.dtsi
Auto-merging arch/arm/boot/dts/batterydata-ey30-lg.dtsi
CONFLICT (add/add): Merge conflict in arch/arm/boot/dts/batterydata-ey30-lg.dtsi
Auto-merging arch/arm/Kconfig.debug
CONFLICT (content): Merge conflict in arch/arm/Kconfig.debug
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/sound/ti-tpa6165a2.txt
CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/sound/ti-tpa6165a2.txt
Auto-merging Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
Auto-merging Documentation/devicetree/bindings/power/qpnp-charger.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/power/qpnp-charger.txt
Auto-merging Documentation/devicetree/bindings/media/video/msm-camera-flash.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/media/video/msm-camera-flash.txt
Auto-merging Documentation/devicetree/bindings/hwmon/qpnp-adc-voltage.txt
Auto-merging Documentation/devicetree/bindings/fb/mdss-mdp.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/fb/mdss-mdp.txt
Auto-merging Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
Auto-merging Documentation/devicetree/bindings/batterydata/batterydata.txt
Merge automatico fallito; risolvi i conflitti ed eseguire il commit
del risultato.