summaryrefslogtreecommitdiffstats
path: root/Documentation/i386
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@anvin.org>2007-01-26 18:15:47 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-01-26 23:59:48 +0100
commitc229ec5dae58b218cab0bc1b36a7647b0ec4900f (patch)
tree30a4f07352ae1c61be4e78fedd59547dce8c42a8 /Documentation/i386
parent[PATCH] ocfs2: fix thinko in ocfs2_backup_super_blkno() (diff)
downloadlinux-c229ec5dae58b218cab0bc1b36a7647b0ec4900f.tar.xz
linux-c229ec5dae58b218cab0bc1b36a7647b0ec4900f.zip
[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 @@
----------------------------
H. Peter Anvin <hpa@zytor.com>
- Last update 2006-11-17
+ Last update 2007-01-26
On the i386 platform, the Linux kernel uses a rather complicated boot
convention. This has evolved partially due to historical aspects, as
@@ -186,6 +186,7 @@ filled out, however:
7 GRuB
8 U-BOOT
9 Xen
+ A Gujin
Please contact <hpa@zytor.com> if you need a bootloader ID
value assigned.