aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/i386
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@anvin.org>2007-01-26 12:15:47 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 17:59:48 -0500
commitc229ec5dae58b218cab0bc1b36a7647b0ec4900f (patch)
tree30a4f07352ae1c61be4e78fedd59547dce8c42a8 /Documentation/i386
parenta8a75a20e9a854685ac3e7af2e0e32f9b0be436b (diff)
[PATCH] Boot loader ID for Gujin
Add an official boot loader ID for Gujin. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/i386')
-rw-r--r--Documentation/i386/boot.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/i386/boot.txt b/Documentation/i386/boot.txt
index 9575de300a61..38fe1f03fb14 100644
--- a/Documentation/i386/boot.txt
+++ b/Documentation/i386/boot.txt
@@ -2,7 +2,7 @@
2 ---------------------------- 2 ----------------------------
3 3
4 H. Peter Anvin <hpa@zytor.com> 4 H. Peter Anvin <hpa@zytor.com>
5 Last update 2006-11-17 5 Last update 2007-01-26
6 6
7On the i386 platform, the Linux kernel uses a rather complicated boot 7On the i386 platform, the Linux kernel uses a rather complicated boot
8convention. This has evolved partially due to historical aspects, as 8convention. This has evolved partially due to historical aspects, as
@@ -186,6 +186,7 @@ filled out, however:
186 7 GRuB 186 7 GRuB
187 8 U-BOOT 187 8 U-BOOT
188 9 Xen 188 9 Xen
189 A Gujin
189 190
190 Please contact <hpa@zytor.com> if you need a bootloader ID 191 Please contact <hpa@zytor.com> if you need a bootloader ID
191 value assigned. 192 value assigned.