diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-09-02 04:17:09 -0400 |
|---|---|---|
| committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-10-11 18:27:23 -0400 |
| commit | 559680d37afd399928fb70a21961d625af7d96bb (patch) | |
| tree | 353da1880d8635f52902396b0027581c737c56e7 /arch/arm/plat-spear | |
| parent | 0a84a160ea79d9479d17b02b5332413159f52be2 (diff) | |
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>
Signed-off-by: Christopher Kenna <cjk@cs.unc.edu>
Diffstat (limited to 'arch/arm/plat-spear')
0 files changed, 0 insertions, 0 deletions