diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-18 02:04:27 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-18 02:04:42 +0200 |
| commit | b08d48414e73fbf743a93b96e2e5449775239e4a (patch) | |
| tree | e6c5bc985ce4c10e88c97d69d8f334cb8a6f1a1e /arch/arm/kernel/hyp-stub.S | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/r... (diff) | |
| parent | ARM: tegra: add tegra_timer clock (diff) | |
| download | linux-b08d48414e73fbf743a93b96e2e5449775239e4a.tar.xz linux-b08d48414e73fbf743a93b96e2e5449775239e4a.zip | |
Merge tag 'tegra-for-3.7-fixes-for-rc2' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm/kernel/hyp-stub.S')
0 files changed, 0 insertions, 0 deletions