summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 15:25:58 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-12-12 15:25:58 -0800
commit062dfa433cce9a2c3941b3b8b96ae678f11230fa (patch)
treeb76f773ef1fab8302e233ac25d23f35d5341b6cd /Documentation
parent7c9dfb5999a7ba90e93a96d9f3ce55a9e4978ad5 (diff)
parent22f975f4ffa707ea24507f6899bb9f5a1ff034bc (diff)
downloadlinux-stable-062dfa433cce9a2c3941b3b8b96ae678f11230fa.tar.gz
linux-stable-062dfa433cce9a2c3941b3b8b96ae678f11230fa.tar.bz2
linux-stable-062dfa433cce9a2c3941b3b8b96ae678f11230fa.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/arm/00-INDEX2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/arm/00-INDEX b/Documentation/arm/00-INDEX
index d753fe59a248..2c6a3b38967e 100644
--- a/Documentation/arm/00-INDEX
+++ b/Documentation/arm/00-INDEX
@@ -16,5 +16,7 @@ empeg
- Empeg documentation
mem_alignment
- alignment abort handler documentation
+memory.txt
+ - description of the virtual memory layout
nwfpe
- NWFPE floating point emulator documentation