git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 195bbca)
ARM: Fix bad merge bd1274dc005 (Merge branch 'v6v7' into devel)
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 2 Sep 2012 08:17:09 +0000 (09:17 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 2 Sep 2012 08:17:09 +0000 (09:17 +0100)
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>

No differences found
Pandora Kernel Repository