From c24b7513b0b8b3d215380c827448ffa9acecbc39 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@stericsson.com>
Date: Mon, 27 Jul 2009 22:11:59 +0100
Subject: [PATCH] --- yaml --- r: 156482 b: refs/heads/master c:
 e624859e7eb6ae2930df3923af73406dc6ccdad8 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/Documentation/arm/memory.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2d157a6083c2..210170d54c1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c640e1cb45cb9ff6b02f5f130a4f2a58ab9ebe55
+refs/heads/master: e624859e7eb6ae2930df3923af73406dc6ccdad8
diff --git a/trunk/Documentation/arm/memory.txt b/trunk/Documentation/arm/memory.txt
index 43cb1004d35f..9d58c7c5eddd 100644
--- a/trunk/Documentation/arm/memory.txt
+++ b/trunk/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.