OMAP: Upstream Patch ups

Signed-off-by: Locasto <amperific@gmail.com>

Conflicts:
	arch/arm/mach-omap2/omap2plus-cpufreq.c
	arch/arm/mach-omap2/opp4xxx_data.c