summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-13 00:07:46 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-13 00:07:46 -0500
commit783e3385a134305d49d7b431df6e591265e7ec14 (patch)
tree7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /Documentation
parentfd803241744ad6e4262b6588c6af89e8fb794098 (diff)
parent1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff)
downloadlinux-783e3385a134305d49d7b431df6e591265e7ec14.tar.gz
linux-783e3385a134305d49d7b431df6e591265e7ec14.tar.bz2
linux-783e3385a134305d49d7b431df6e591265e7ec14.zip
Merge branch 'upstream-fixes'
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