diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-17 01:05:43 -0400 |
| commit | 803db244b9f71102e366fd689000c1417b9a7508 (patch) | |
| tree | 2fe1abfd16cded8074905b6b91d9d1943e15325e /Documentation/i386/boot.txt | |
| parent | 8b98a37c4b00f3fbcf162281bd4595777e61241b (diff) | |
| parent | f04b92e97d21b1921c91ec1d6d5e8bbf8606b77a (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'Documentation/i386/boot.txt')
| -rw-r--r-- | Documentation/i386/boot.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt index 10312bebe55d..c51314b1a463 100644 --- a/Documentation/i386/boot.txt +++ b/Documentation/i386/boot.txt | |||
| @@ -181,6 +181,7 @@ filled out, however: | |||
| 181 | 5 ELILO | 181 | 5 ELILO |
| 182 | 7 GRuB | 182 | 7 GRuB |
| 183 | 8 U-BOOT | 183 | 8 U-BOOT |
| 184 | 9 Xen | ||
| 184 | 185 | ||
| 185 | Please contact <hpa@zytor.com> if you need a bootloader ID | 186 | Please contact <hpa@zytor.com> if you need a bootloader ID |
| 186 | value assigned. | 187 | value assigned. |