diff options
author | 2012-09-21 13:48:01 -0700 | |
---|---|---|
committer | 2012-09-21 13:48:01 -0700 | |
commit | 0c9de3c52d2baed6bc2ee44885adb418152c71c4 (patch) | |
tree | e19ab2c41ae47250fd614418022b32aa783aa563 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge tag 'omap-cleanup-sparseirq-for-v3.7' into devel-dt (diff) | |
parent | ARM: OMAP5: Enable arch timer support (diff) | |
download | linux-dev-0c9de3c52d2baed6bc2ee44885adb418152c71c4.tar.xz linux-dev-0c9de3c52d2baed6bc2ee44885adb418152c71c4.zip |
Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
Conflicts:
arch/arm/mach-omap2/timer.c
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions