Merge branch 'froyo' into vendor-vs660-froyo
Pristine VS660 source
Merge branch 'vendor-vs660-froyo' into thunderc-froyo

Conflicts:
	arch/arm/configs/msm8660-chromeos_defconfig
	arch/arm/configs/thundera-perf_defconfig
	arch/arm/configs/thunderc-perf_defconfig
	arch/arm/configs/thunderg-perf_defconfig
	arch/arm/mach-msm/clock-debug.c
	arch/arm/mach-msm/hw3d.c
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/board_lge.h
	arch/arm/mach-msm/include/mach/lg_comdef.h
	arch/arm/mach-msm/include/mach/lg_diag_keypress.h
	arch/arm/mach-msm/include/mach/lg_diag_screen_shot.h
	arch/arm/mach-msm/include/mach/lg_diag_testmode.h
	arch/arm/mach-msm/include/mach/lg_diag_udm.h
	arch/arm/mach-msm/include/mach/lg_diagcmd.h
	arch/arm/mach-msm/include/mach/lg_fw_diag_mtc.h
	arch/arm/mach-msm/include/mach/lge_diag_test.h
	arch/arm/mach-msm/include/mach/memory.h
	arch/arm/mach-msm/include/mach/msm_battery_thunderc.h
	arch/arm/mach-msm/include/mach/msm_iomap-7xxx.h
	arch/arm/mach-msm/include/mach/msm_rpcrouter.h
	arch/arm/mach-msm/include/mach/oem_rapi_client.h
	arch/arm/mach-msm/include/mach/rpc_hsusb.h
	arch/arm/mach-msm/include/mach/timed_output.h
	arch/arm/mach-msm/include/mach/vmalloc.h
	arch/arm/mach-msm/lge/Kconfig
	arch/arm/mach-msm/lge/Makefile
	arch/arm/mach-msm/lge/board-thunderc-bt.c
	arch/arm/mach-msm/lge/board-thunderc-camera.c
	arch/arm/mach-msm/lge/board-thunderc-input.c
	arch/arm/mach-msm/lge/board-thunderc-misc.c
	arch/arm/mach-msm/lge/board-thunderc-mmc.c
	arch/arm/mach-msm/lge/board-thunderc-panel.c
	arch/arm/mach-msm/lge/board-thunderc-snd.c
	arch/arm/mach-msm/lge/board-thunderc.c
	arch/arm/mach-msm/lge/board-thunderc.h
	arch/arm/mach-msm/lge/board-thunderg-bt.c
	arch/arm/mach-msm/lge/board-thunderg-camera.c
	arch/arm/mach-msm/lge/board-thunderg-input.c
	arch/arm/mach-msm/lge/board-thunderg-misc.c
	arch/arm/mach-msm/lge/board-thunderg-mmc.c
	arch/arm/mach-msm/lge/board-thunderg-panel.c
	arch/arm/mach-msm/lge/board-thunderg-snd.c
	arch/arm/mach-msm/lge/board-thunderg.c
	arch/arm/mach-msm/lge/board-thunderg.h
	arch/arm/mach-msm/lge/devices_lge.c
	arch/arm/mach-msm/lge/lg_diag_event_log.c
	arch/arm/mach-msm/lge/lg_diag_keypress.c
	arch/arm/mach-msm/lge/lg_diag_screen_shot.c
	arch/arm/mach-msm/lge/lg_diag_testmode.c
	arch/arm/mach-msm/lge/lg_diag_udm.c
	arch/arm/mach-msm/lge/lg_diag_wifi.c
	arch/arm/mach-msm/lge/lg_fw_diag_class.c
	arch/arm/mach-msm/lge/lg_fw_diag_communication.c
	arch/arm/mach-msm/lge/lg_fw_diag_communication.h
	arch/arm/mach-msm/lge/lg_fw_diag_mtc.c
	arch/arm/mach-msm/lge/lge_ats.c
	arch/arm/mach-msm/lge/lge_ats.h
	arch/arm/mach-msm/lge/lge_ats_cmd.c
	arch/arm/mach-msm/lge/lge_ats_cmd.h
	arch/arm/mach-msm/lge/lge_ats_eta.c
	arch/arm/mach-msm/lge/lge_ats_event_log.c
	arch/arm/mach-msm/lge/lge_ats_input.c
	arch/arm/mach-msm/lge/lge_ats_mmc.c
	arch/arm/mach-msm/lge/lge_ats_uevent.c
	arch/arm/mach-msm/lge/lge_ers.c
	arch/arm/mach-msm/lge/lge_gpio_h2w.c
	arch/arm/mach-msm/lge/lge_gpio_switch.c
	arch/arm/mach-msm/lge/lge_handle_panic.c
	arch/arm/mach-msm/lge/lge_mtd_direct_access.c
	arch/arm/mach-msm/lge/lge_proc_comm.c
	arch/arm/mach-msm/nand_partitions.c
	arch/arm/mach-msm/pm2.c
	arch/arm/mach-msm/qdsp5/snd.c
	arch/arm/mach-msm/qdsp6v2/Makefile
	arch/arm/mach-msm/qdsp6v2/audio_dev_ctl.c
	arch/arm/mach-msm/qdsp6v2/snddev_data.c
	arch/arm/mach-msm/qdsp6v2/snddev_ecodec.c
	arch/arm/mach-msm/qdsp6v2/snddev_ecodec.h
	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/rpc_hsusb.c
	arch/arm/mach-msm/rpc_server_handset.c
	arch/arm/mach-msm/smd.c
	arch/arm/mach-msm/smd_private.h
	arch/arm/mach-msm/smd_rpc_sym.c
	arch/arm/mach-msm/smd_rpcrouter_servers.c
	arch/arm/mach-msm/smd_rpcrouter_xdr.c
	arch/arm/tools/mach-types
	arch/arm/vfp/vfpmodule.c
	drivers/bluetooth/bluetooth-power.c
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/char/diag/lg_diag_kernel_service.c
	drivers/char/diag/lg_diag_kernel_service.h
	drivers/gpu/msm/kgsl_g12.h
	drivers/gpu/msm/kgsl_yamato.h
	drivers/input/misc/gpio_matrix.c
	drivers/input/sensor/Kconfig
	drivers/input/sensor/Makefile
	drivers/input/sensor/akm8973.c
	drivers/input/sensor/ami304.c
	drivers/input/sensor/ami304.h
	drivers/input/sensor/ami602.c
	drivers/input/sensor/ami602.h
	drivers/input/sensor/bma150.c
	drivers/input/sensor/gp2ap002.c
	drivers/input/sensor/kr3dh.c
	drivers/input/sensor/kr3dm.c
	drivers/input/sensor/lis331dlh.h
	drivers/input/sensor/smb380.c
	drivers/input/sensor/smb380.h
	drivers/input/touchscreen/mcs6000_ts.c
	drivers/input/touchscreen/touch_mcs6000_down_ioctl.h
	drivers/input/touchscreen/touch_mcs6000_ioctl.h
	drivers/leds/leds-msm-pmic.c
	drivers/media/video/msm/Makefile
	drivers/media/video/msm/imx074.c
	drivers/media/video/msm/imx074.h
	drivers/media/video/msm/imx074_reg.c
	drivers/media/video/msm/isx005.c
	drivers/media/video/msm/isx005.h
	drivers/media/video/msm/isx005_reg.h
	drivers/media/video/msm/msm_camera.c
	drivers/media/video/msm/msm_io7x.c
	drivers/media/video/msm/msm_io8x.c
	drivers/misc/android_vibrator.c
	drivers/misc/vidc/720p/ddl/vcd_ddl.c
	drivers/misc/vidc/720p/ddl/vcd_ddl.h
	drivers/misc/vidc/720p/ddl/vcd_ddl_api.h
	drivers/misc/vidc/720p/ddl/vcd_ddl_core.h
	drivers/misc/vidc/720p/ddl/vcd_ddl_errors.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_firmware.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_firmware.h
	drivers/misc/vidc/720p/ddl/vcd_ddl_hal.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_helper.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_internal_property.h
	drivers/misc/vidc/720p/ddl/vcd_ddl_interrupt_handler.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_metadata.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_metadata.h
	drivers/misc/vidc/720p/ddl/vcd_ddl_properties.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_utils.c
	drivers/misc/vidc/720p/ddl/vcd_ddl_utils.h
	drivers/misc/vidc/720p/ddl/vidc.c
	drivers/misc/vidc/720p/ddl/vidc.h
	drivers/misc/vidc/720p/resource_tracker/vcd_res_tracker.c
	drivers/misc/vidc/720p/resource_tracker/vcd_res_tracker.h
	drivers/misc/vidc/720p/resource_tracker/vcd_res_tracker_api.h
	drivers/misc/vidc/Kconfig
	drivers/misc/vidc/Makefile
	drivers/misc/vidc/common/dec/vdec.c
	drivers/misc/vidc/common/dec/vdec_internal.h
	drivers/misc/vidc/common/enc/venc.c
	drivers/misc/vidc/common/enc/venc_internal.c
	drivers/misc/vidc/common/enc/venc_internal.h
	drivers/misc/vidc/common/init/vidc_init.c
	drivers/misc/vidc/common/init/vidc_init.h
	drivers/misc/vidc/common/init/vidc_init_internal.h
	drivers/misc/vidc/common/scheduler/vid_frame_scheduler.c
	drivers/misc/vidc/common/scheduler/vid_frame_scheduler.h
	drivers/misc/vidc/common/scheduler/vid_frame_scheduler_api.c
	drivers/misc/vidc/common/scheduler/vid_frame_scheduler_api.h
	drivers/misc/vidc/common/scheduler/vid_frame_scheduler_utils.c
	drivers/misc/vidc/common/scheduler/vid_frame_scheduler_utils.h
	drivers/misc/vidc/common/vcd/vcd.h
	drivers/misc/vidc/common/vcd/vcd_api.c
	drivers/misc/vidc/common/vcd/vcd_api.h
	drivers/misc/vidc/common/vcd/vcd_client_sm.c
	drivers/misc/vidc/common/vcd/vcd_client_sm.h
	drivers/misc/vidc/common/vcd/vcd_core.h
	drivers/misc/vidc/common/vcd/vcd_device_sm.c
	drivers/misc/vidc/common/vcd/vcd_device_sm.h
	drivers/misc/vidc/common/vcd/vcd_power_sm.c
	drivers/misc/vidc/common/vcd/vcd_power_sm.h
	drivers/misc/vidc/common/vcd/vcd_property.h
	drivers/misc/vidc/common/vcd/vcd_status.h
	drivers/misc/vidc/common/vcd/vcd_sub.c
	drivers/misc/vidc/common/vcd/vcd_util.c
	drivers/misc/vidc/common/vcd/vcd_util.h
	drivers/misc/vidc/common/vcd/vidc_type.h
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/host/msm_sdcc.c
	drivers/mtd/devices/msm_nand.c
	drivers/net/wireless/bcm4325/Makefile
	drivers/net/wireless/bcm4325/brcm_static_buf.c
	drivers/net/wireless/bcm4325/src/bcmsdio/sys/bcmsdh_sdmmc.c
	drivers/net/wireless/bcm4325/src/bcmsdio/sys/bcmsdh_sdmmc_linux.c
	drivers/net/wireless/bcm4325/src/dhd/sys/dhd.h
	drivers/net/wireless/bcm4325/src/dhd/sys/dhd_cdc.c
	drivers/net/wireless/bcm4325/src/dhd/sys/dhd_common.c
	drivers/net/wireless/bcm4325/src/dhd/sys/dhd_custom_gpio.c
	drivers/net/wireless/bcm4325/src/dhd/sys/dhd_linux.c
	drivers/net/wireless/bcm4325/src/dhd/sys/dhd_sdio.c
	drivers/net/wireless/bcm4325/src/shared/linux_osl.c
	drivers/net/wireless/bcm4325/src/wl/sys/wl_iw.c
	drivers/net/wireless/bcm4325/src/wl/sys/wl_iw.h
	drivers/net/wireless/bcm4329/include/hndrte_armtrap.h
	drivers/power/max17040.c
	drivers/power/msm_battery.c
	drivers/power/msm_battery_alohav.c
	drivers/power/msm_battery_gisele.c
	drivers/power/msm_battery_thunderc.c
	drivers/power/power_supply_sysfs.c
	drivers/staging/android/ram_console.c
	drivers/usb/function/Kconfig
	drivers/usb/function/mass_storage.c
	drivers/usb/function/msm_hsusb.c
	drivers/usb/function/msm_hsusb_cdma.c
	drivers/usb/function/msm_hsusb_gsm.c
	drivers/usb/function/serial.c
	drivers/usb/gadget/msm72k_udc.c
	drivers/usb/otg/msm72k_otg.c
	drivers/video/Kconfig
	drivers/video/backlight/aat2870_bl.c
	drivers/video/console/fbcon.c
	drivers/video/msm/Makefile
	drivers/video/msm/mddi_hitachi_hvga.c
	drivers/video/msm/mddi_novatek_hvga.c
	drivers/video/msm/mddihost.h
	drivers/video/msm/mdp_dma.c
	drivers/video/msm/mdp_hw.h
	drivers/video/msm/mdp_hw_init.c
	drivers/video/msm/mdp_ppp.c
	drivers/video/msm/msm_fb.c
	fs/fat/dir.c
	include/linux/akm8973.h
	include/linux/lge_alohag_at.h
	include/linux/mmc/host.h
	include/linux/msm_audio.h
	include/linux/wlan_plat.h
	include/media/msm_camera.h
	kernel/power/earlysuspend.c
	net/wireless/wext.c
	scripts/mkcompile_h