| commit | a67e1ce145785d884b29b17e4d82a6ecd67bb97a | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Sep 02 09:17:09 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Sun Sep 02 09:17:09 2012 +0100 |
| tree | e36cfe427b06ff96646d2753d71c99b91277a78a | |
| parent | 195bbcac2e5c12f7fb99cdcc492c3000c5537f4a [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>