Russell King a67e1ce145 ARM: Fix bad merge bd1274dc00 (Merge branch 'v6v7' into devel) ... Commit 774c096bf9 (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 753790e713 (ARM: move cache/processor/fault glue to separate include files) was fixed up in merge bd1274dc00 (Merge branch 'v6v7' into devel). This puts the change back. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>		2012-09-02 09:17:09 +01:00
..
asm	ARM: Fix bad merge bd1274dc00 (Merge branch 'v6v7' into devel)	2012-09-02 09:17:09 +01:00