diff options
author | 2013-04-09 17:52:43 +0200 | |
---|---|---|
committer | 2013-04-09 17:52:43 +0200 | |
commit | f8da810cbb823c9781d703319ac4303568008fae (patch) | |
tree | 03b33a2e85f0cfc2547749aa28acf4630f6989ac /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'mxs-dt-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt2 (diff) | |
parent | clk: tegra: fix enum tegra114_clk to match binding (diff) | |
download | linux-dev-f8da810cbb823c9781d703319ac4303568008fae.tar.xz linux-dev-f8da810cbb823c9781d703319ac4303568008fae.zip |
Merge branch 'tegra/clk' into next/dt2
This is a dependency for the tegra/dt branch.
Conflicts:
drivers/clocksource/tegra20_timer.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions