tegra3_clocks: upstream 3.4 compatible

Conflicts:
	arch/arm/mach-tegra/tegra3_clocks.c