diff options
author | 2012-05-09 23:24:53 -0700 | |
---|---|---|
committer | 2012-05-09 23:26:20 -0700 | |
commit | a72ce69097a2709bdbda34e2f77b8388a1323923 (patch) | |
tree | 526ea58089c5b0df7873f7d86fa3e314ec848855 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'omap-cleanup-cpuidle-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup (diff) | |
parent | ARM: tegra: do not hide dma declarations (diff) | |
download | linux-dev-a72ce69097a2709bdbda34e2f77b8388a1323923.tar.xz linux-dev-a72ce69097a2709bdbda34e2f77b8388a1323923.zip |
Merge branch 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup
By Arnd Bergmann (1) and Danny Kukawka (1)
via Stephen Warren
* 'for-3.5/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
ARM: tegra: do not hide dma declarations
ARM: tegra: fix multiple asm/hardware/gic.h inclusion
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions