Merge commit 'v2.6.32-rc5' into for-linus

[deliverable/linux.git] / Documentation / arm / memory.txt

diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 43cb1004d35fb72da88424321ab108da124c52d0..9d58c7c5eddd082b9a22c087c7e0023e02fa4b02 100644 (file)
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -21,6 +21,8 @@ ffff8000      ffffffff        copy_user_page / clear_user_page use.
                                For SA11xx and Xscale, this is used to
                                setup a minicache mapping.
 
+ffff4000       ffffffff        cache aliasing on ARMv6 and later CPUs.
+
 ffff1000       ffff7fff        Reserved.
                                Platforms must not use this address range.