From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 2 Sep 2012 08:17:09 +0000 (+0100)
Subject: ARM: Fix bad merge bd1274dc005 (Merge branch 'v6v7' into devel)
X-Git-Tag: omap-for-v3.7-rc1/fixes-hwmod-clock-signed-v3~1^2~2^5~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a67e1ce145785d884b29b17e4d82a6ecd67bb97a;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed