CAF's last known commit to board-msm7x27
msm_fb from jb_choco
Initial import of Galaxy Legacy drivers

Conflicts:

	drivers/video/msm/lcdc_s6d16a0x_gio.c
some rework

Conflicts:

	arch/arm/mach-msm/Makefile.boot
	arch/arm/mach-msm/board-msm7x27.c
	arch/arm/mach-msm/devices-msm7x27.c
	arch/arm/mach-msm/pm2.c
	drivers/dpram/dpram.c
	drivers/misc/sec_jack.c
	drivers/net/wireless/bcm4329/Makefile
	include/linux/sec_jack.h
	net/bluetooth/hci_conn.c
galaxy legacy batterydrivers from 2.6.35.14

Conflicts:

	drivers/power/Makefile
reworking for galaxy legacy devices (for now only Gio)

Conflicts:

	drivers/i2c/chips/Kconfig
	drivers/i2c/chips/Makefile
	drivers/media/video/msm/Kconfig
more rework, more to be done

Conflicts:

	drivers/Makefile
	drivers/video/msm/mdp_dma_lcdc.c
	drivers/video/msm/msm_fb.c
rework board-gio.c to meet board-msm7x27.c
small revert
update

Conflicts:

	AndroidKernel.mk
	arch/arm/mach-msm/acpuclock-7201.c
	arch/arm/mach-msm/acpuclock.h
	drivers/dpram/Kconfig
	drivers/dpram/dpram.h
	drivers/dpram/multipdp.c
	drivers/video/msm/adv7520.c
	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.c
	drivers/video/msm/lcdc_qrdc.c
	drivers/video/msm/mddi.c
	drivers/video/msm/mddi_client_simple.c
	drivers/video/msm/mddi_ext.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_dtv.c
	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/mdp_debugfs.c
	drivers/video/msm/mdp_dma.c
	drivers/video/msm/mdp_hw_legacy.c
	drivers/video/msm/mdp_ppp.c
	drivers/video/msm/mdp_ppp_v20.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi.h
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/mipi_novatek.c
	drivers/video/msm/mipi_toshiba.c
	drivers/video/msm/mipi_toshiba.h
	drivers/video/msm/msm_fb.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_core.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.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_utils.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	drivers/video/msm/vidc/1080p/ddl/vidc.c
	drivers/video/msm/vidc/720p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/720p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.c
	drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c
	drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.h
	drivers/video/msm/vidc/common/dec/vdec.c
	drivers/video/msm/vidc/common/enc/venc.c
	drivers/video/msm/vidc/common/init/vidc_init.c
	drivers/video/msm/vidc/common/init/vidc_init.h
	drivers/video/msm/vidc/common/vcd/vcd.h
	drivers/video/msm/vidc/common/vcd/vcd_api.h
	drivers/video/msm/vidc/common/vcd/vcd_client_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_power_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_property.h
	drivers/video/msm/vidc/common/vcd/vcd_status.h
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
	drivers/video/msm/vidc/common/vcd/vidc_type.h
Revert "update"

This reverts commit f0e8da02985bacb4568d32a7a88c237a7ef21dc4.

Conflicts:

	arch/arm/mach-msm/acpuclock-7201.c
	drivers/video/msm/adv7520.c
	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.c
	drivers/video/msm/mddi.c
	drivers/video/msm/mddi_ext.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_dtv.c
	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/mdp_debugfs.c
	drivers/video/msm/mdp_dma.c
	drivers/video/msm/mdp_dma_lcdc.c
	drivers/video/msm/mdp_ppp.c
	drivers/video/msm/mdp_ppp_v20.c
	drivers/video/msm/mdp_vsync.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi.h
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/mipi_novatek.c
	drivers/video/msm/mipi_toshiba.c
	drivers/video/msm/mipi_toshiba.h
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_core.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.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_utils.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	drivers/video/msm/vidc/1080p/ddl/vidc.c
	drivers/video/msm/vidc/720p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/720p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.c
	drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.h
	drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c
	drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.h
	drivers/video/msm/vidc/common/dec/vdec.c
	drivers/video/msm/vidc/common/enc/venc.c
	drivers/video/msm/vidc/common/init/vidc_init.c
	drivers/video/msm/vidc/common/vcd/vcd.h
	drivers/video/msm/vidc/common/vcd/vcd_client_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_power_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
corrections + update

Conflicts:

	arch/arm/mach-msm/acpuclock-7201.c
	drivers/Makefile
	drivers/video/msm/msm_fb.c
_ARCH_MSM7X27 double defined
orig acpuclock-7201.c

Conflicts:

	arch/arm/mach-msm/acpuclock-7201.c
Add config MSM_ARM9_USES_UART3 and Add dummy RFS driver

The Flex Sector Remapper driver needs certain RFS kernel config
options to be enabled, so we'll add a dummy RFS config to satisfy
the build. This also fixes the errors on invoking "make clean".

Conflicts:

	fs/Kconfig
update init/main.c

Conflicts:

	init/main.c
update pm2.c
Bulk update

Changed msm to what should be working
Added fsr directory from psyke

Conflicts:

	drivers/video/msm/adv7520.c
	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.c
	drivers/video/msm/mddi.c
	drivers/video/msm/mddi_ext.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp.h
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_dtv.c
	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/mdp_debugfs.c
	drivers/video/msm/mdp_dma.c
	drivers/video/msm/mdp_dma_lcdc.c
	drivers/video/msm/mdp_ppp.c
	drivers/video/msm/mdp_ppp_v20.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi.h
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/mipi_novatek.c
	drivers/video/msm/mipi_toshiba.c
	drivers/video/msm/mipi_toshiba.h
	drivers/video/msm/msm_fb.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_core.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_errors.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.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_utils.c
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_utils.h
	drivers/video/msm/vidc/1080p/ddl/vcd_ddl_vidc.c
	drivers/video/msm/vidc/1080p/ddl/vidc.c
	drivers/video/msm/vidc/720p/ddl/vcd_ddl.c
	drivers/video/msm/vidc/720p/ddl/vcd_ddl.h
	drivers/video/msm/vidc/720p/ddl/vcd_ddl_utils.c
	drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.c
	drivers/video/msm/vidc/720p/resource_tracker/vcd_res_tracker.h
	drivers/video/msm/vidc/common/dec/vdec.c
	drivers/video/msm/vidc/common/enc/venc.c
	drivers/video/msm/vidc/common/init/vidc_init.c
	drivers/video/msm/vidc/common/vcd/vcd.h
	drivers/video/msm/vidc/common/vcd/vcd_client_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_power_sm.c
	drivers/video/msm/vidc/common/vcd/vcd_sub.c
	init/main.c
Update board-cooper
Fix cooper-keypad for msm-3.0