Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / Documentation / filesystems / xip.txt

diff --git a/Documentation/filesystems/xip.txt b/Documentation/filesystems/xip.txt
index 6c0cef10eb4d95a9cfe48eed7ec27c0a3a160bee..3cc4010521a019562e68eb070aa83ad78b0e8c4b 100644 (file)
--- a/Documentation/filesystems/xip.txt
+++ b/Documentation/filesystems/xip.txt
@@ -19,7 +19,7 @@ completely. With execute-in-place, read&write type operations are performed
 directly from/to the memory backed storage device. For file mappings, the
 storage device itself is mapped directly into userspace.
 
 directly from/to the memory backed storage device. For file mappings, the
 storage device itself is mapped directly into userspace.
 

-This implementation was initialy written for shared memory segments between
+This implementation was initially written for shared memory segments between

 different virtual machines on s390 hardware to allow multiple machines to
 share the same binaries and libraries.
 
 different virtual machines on s390 hardware to allow multiple machines to
 share the same binaries and libraries.