projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 195bbca) | patch
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)
commita67e1ce145785d884b29b17e4d82a6ecd67bb97a
treee36cfe427b06ff96646d2753d71c99b91277a78atree | snapshot
parent195bbcac2e5c12f7fb99cdcc492c3000c5537f4acommit | 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>
arch/arm/include/asm/glue-cache.h diff | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git