Merge master.kernel.org:/home/rmk/linux-2.6-arm

1 files changed, 3 insertions, 1 deletions

diff --git a/Documentation/arm/memory.txt b/Documentation/arm/memory.txt
index 4b1c93a8177b..dc6045577a8b 100644
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
@@ -1,7 +1,7 @@
                 Kernel Memory Layout on ARM Linux
 
                 Russell King <rmk@arm.linux.org.uk>
-                        May 21, 2004 (2.6.6)
+                     November 17, 2005 (2.6.15)
 
 This document describes the virtual memory layout which the Linux
 kernel uses for ARM processors.  It indicates which regions are
@@ -37,6 +37,8 @@ ff000000	ffbfffff	Reserved for future expansion of DMA
                                 mapping region.
 
 VMALLOC_END     feffffff        Free for platform use, recommended.
+                                VMALLOC_END must be aligned to a 2MB
+                                boundary.
 
 VMALLOC_START   VMALLOC_END-1   vmalloc() / ioremap() space.
                                 Memory returned by vmalloc/ioremap will