remove LAB126 metrics logging
clean up unused twl6030_qcharger_platform_data
ifdef cleanup: ion for VIDEO_OMAP_DCE
ifdef cleanup: sound for SND_OMAP_SOC_RY_AIC3110
cleanup kernel/power/suspend comment
ifdef cleanup: led include for custom OTTER led functions
ifdef cleanup: arch/arm/* for MACH_OMAP_4430_KC1
ifdef cleanup: drivers/mmc for OTTER
ifdef cleanup: drivers/cpufreq for MACH_OMAP_4430_KC1
ifdef cleanup: thermal_framework include for MACH_OMAP_4430_KC1
ifdef cleanup: drivers/usb for MACH_OMAP_4430_KC1
ifdef cleanup: drivers/mfd/twl* for MACH_OMAP_4430_KC1
ifdef cleanup: drivers/video/omap2/dss for MACH_OMAP_4430_KC1
ifdef cleanup: drivers/hwmod/lm75.c for MACH_OMAP_4430_KC1
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2-omap-3.0

Conflicts:
	drivers/mmc/core/mmc.c