Signed-off-by: Andrea Gelmini <andrea.gelm...@gelma.net>
---
 Documentation/filesystems/ramfs-rootfs-initramfs.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/filesystems/ramfs-rootfs-initramfs.txt 
b/Documentation/filesystems/ramfs-rootfs-initramfs.txt
index b176928..68de194 100644
--- a/Documentation/filesystems/ramfs-rootfs-initramfs.txt
+++ b/Documentation/filesystems/ramfs-rootfs-initramfs.txt
@@ -221,7 +221,7 @@ archive into rootfs before trying to run /init.
 
 This has the memory efficiency advantages of initramfs (no ramdisk block
 device) but the separate packaging of initrd (which is nice if you have
-non-GPL code you'd like to run from initramfs, without conflating it with
+non-GPL code you'd like to run from initramfs, without conflicting it with
 the GPL licensed Linux kernel binary).
 
 It can also be used to supplement the kernel's built-in initramfs image.  The
-- 
2.8.2.534.g1f66975

--
To unsubscribe from this list: send the line "unsubscribe linux-doc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to