diff options
| author |   Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-02 09:17:09 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-02 09:17:09 +0100 |
| commit | a67e1ce145785d884b29b17e4d82a6ecd67bb97a (patch) | |
| tree | e36cfe427b06ff96646d2753d71c99b91277a78a /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | ARM: 7500/1: io: avoid writeback addressing modes for __raw_ accessors (diff) | |
| download | linux-dev-a67e1ce145785d884b29b17e4d82a6ecd67bb97a.tar.xz linux-dev-a67e1ce145785d884b29b17e4d82a6ecd67bb97a.zip | |
ARM: Fix bad merge bd1274dc005 (Merge branch 'v6v7' into devel)
Commit 774c096bf9e49 (ARM: v6/v7 cache: allow cache calls to be
optimized) got dropped when the merge conflicts for moving the contents
of the files in commit 753790e713d (ARM: move cache/processor/fault
glue to separate include files) was fixed up in merge bd1274dc005
(Merge branch 'v6v7' into devel).
This puts the change back.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions