From 04e00f49aa9045e805d90e287125af0e339c242f Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 27 Sep 2006 01:50:21 -0700
Subject: [PATCH] --- yaml --- r: 36171 b: refs/heads/master c:
 0112c4c6461fed12ed9bcb249f967bc17a23f6c4 h: refs/heads/master i:   36169:
 42551b91b5069d40c08f88ca648e7859b0ecbe42   36167:
 7e5451fcdc6777abbac9ebef04d904730264bcbf v: v3

---
 [refs]                             | 2 +-
 trunk/Documentation/nommu-mmap.txt | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7a6d7fbfedf4..76feef90185d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fa5f80bc34da1a49b42117602b44441402cac2f
+refs/heads/master: 0112c4c6461fed12ed9bcb249f967bc17a23f6c4
diff --git a/trunk/Documentation/nommu-mmap.txt b/trunk/Documentation/nommu-mmap.txt
index 3ce890664936..4db7c18bf68c 100644
--- a/trunk/Documentation/nommu-mmap.txt
+++ b/trunk/Documentation/nommu-mmap.txt
@@ -129,6 +129,15 @@ FURTHER NOTES ON NO-MMU MMAP
      with character device files, pipes, fifos and sockets.
 
 
+==========================
+INTERPROCESS SHARED MEMORY
+==========================
+
+Both SYSV IPC SHM shared memory and POSIX shared memory is supported in NOMMU
+mode.  The former through the usual mechanism, the latter through files created
+on ramfs or tmpfs mounts.
+
+
 =============
 NO-MMU MREMAP
 =============