diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:43:45 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:43:45 +0200 |
| commit | 442a33ebce9e02a2dd6662f16c9f2aad834d0115 (patch) | |
| tree | ca8654a286f61da917318645cab9e061095ecdba /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | ARM: SPEAr: conditionalize SMP code (diff) | |
| parent | ARM: arch_timer: Silence debug preempt warnings (diff) | |
| download | linux-dev-442a33ebce9e02a2dd6662f16c9f2aad834d0115.tar.xz linux-dev-442a33ebce9e02a2dd6662f16c9f2aad834d0115.zip | |
Merge branch 'late/clksrc' into late/cleanup
There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.
Conflicts:
arch/arm/mach-spear/spear13xx.c
drivers/irqchip/Makefile
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions