compile fix
fixed conflicts

Conflicts:
	arch/arm/mach-tegra/Kconfig
	drivers/cpufreq/cpufreq.c
fixed conflicts
Remove duplicate freq table
fixed conflicts

Conflicts:
	arch/arm/mach-tegra/tegra3_clocks.c
fixed a typo - thanks to Wenque
Revert "tspdrv: Add LG's timed_output based interface"

This reverts commit 9d6fe07e59c571fbe1c18da5915681b58e01fa67.
possible vibrator fix

Conflicts:
	drivers/misc/tspdrv/imm_timed_output.c
possible vibrator fix #2
rolling back all CM merges

Conflicts:
	drivers/misc/tspdrv/ImmVibeSPI.c
	drivers/misc/tspdrv/tspdrv.c
added CM changes
Rework 'update based on LG notes'
re-worked all clocks

Conflicts:
	arch/arm/mach-tegra/tegra3_clocks.c
	drivers/cpufreq/cpufreq.c
fixed conflicts

Conflicts:
	arch/arm/mach-tegra/cpu-tegra.c
	arch/arm/mach-tegra/edp.c
	arch/arm/mach-tegra/tegra3_clocks.c
	arch/arm/mach-tegra/tegra3_dvfs.c
	drivers/cpufreq/cpufreq.c
	drivers/video/tegra/host/nvhost_acm.c
fixed a typo - thanks to Wenque
Revert "cpufreq.c: add userspace voltage control. Original implementation from faux123 (which was based on Michael Huang's OMAP4460 work). Interface cleaned up, made more robust and secure"

This reverts commit 22a294fa6d90a944517a559e1bbc3e5fdd66ab97.

Conflicts:
	drivers/cpufreq/cpufreq.c