diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 00:46:20 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-10-27 00:46:20 -0400 |
| commit | 6ad390a25a9d1d8606b9b826878f0a30639dc2b3 (patch) | |
| tree | 05aff14f02776bc0d59a1f777cb92df6f4456ba9 /Documentation/filesystems/nfs/nfsroot.txt | |
| parent | d6069dae4700cf5290a75002c46b9be8ea7eef3c (diff) | |
| parent | 3f48e7354358519e5b93f7f755ec270b3f8eafa0 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'Documentation/filesystems/nfs/nfsroot.txt')
| -rw-r--r-- | Documentation/filesystems/nfs/nfsroot.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/filesystems/nfs/nfsroot.txt b/Documentation/filesystems/nfs/nfsroot.txt index 90c71c6f0d00..ffdd9d866ad7 100644 --- a/Documentation/filesystems/nfs/nfsroot.txt +++ b/Documentation/filesystems/nfs/nfsroot.txt | |||
| @@ -226,7 +226,7 @@ They depend on various facilities being available: | |||
| 226 | cdrecord. | 226 | cdrecord. |
| 227 | 227 | ||
| 228 | e.g. | 228 | e.g. |
| 229 | cdrecord dev=ATAPI:1,0,0 arch/i386/boot/image.iso | 229 | cdrecord dev=ATAPI:1,0,0 arch/x86/boot/image.iso |
| 230 | 230 | ||
| 231 | For more information on isolinux, including how to create bootdisks | 231 | For more information on isolinux, including how to create bootdisks |
| 232 | for prebuilt kernels, see http://syslinux.zytor.com/ | 232 | for prebuilt kernels, see http://syslinux.zytor.com/ |