From: Olof Johansson <olof@lixom.net>
Date: Thu, 18 Oct 2012 00:04:27 +0000 (-0700)
Subject: Merge tag 'tegra-for-3.7-fixes-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b08d48414e73fbf743a93b96e2e5449775239e4a;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge tag 'tegra-for-3.7-fixes-for-rc2' of git://git./linux/kernel/git/swarren/linux-tegra into fixes

From Stephen Warren: ARM: tegra: fixes for 3.7-rc2

This branch contains a couple small fixes for Tegra for 3.7.

* A fix for another clock rate calculation overflow
* A revert of a change that removed the "timer" clock on Tegra, coupled
  with a fix for the confusing symbol name clash that triggered it.

* tag 'tegra-for-3.7-fixes-for-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: add tegra_timer clock
  ARM: tegra: rename tegra system timer
  ARM: tegra30: clk: Fix output_rate overflow

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b08d48414e73fbf743a93b96e2e5449775239e4a