]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 71989ac) | patch
ARM: Fix bad merge 85194cb4a10 (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)
commitc7c0be5c18301c65f5c3423efcd1861f16b7bdff
treee36cfe427b06ff96646d2753d71c99b91277a78atree | snapshot
parent71989acb7e97c3af808eb5310baf40e1a5aab682commit | diff
ARM: Fix bad merge 85194cb4a10 (Merge branch 'v6v7' into devel)

Commit efe88de6a3fc5 (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 e45c828e7e9 (ARM: move cache/processor/fault
glue to separate include files) was fixed up in merge 85194cb4a10
(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
Linux Kernel Source Tree.