diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-21 10:18:14 -0400 |
commit | 91fa47964165a42401fbc1f41caa63ab78564305 (patch) | |
tree | 8f4ffdcbdedd845563630c3bcacd9407c75ccb52 /Documentation/i386/zero-page.txt | |
parent | 56965536b8056f57830219efbba4b85218d96d6c (diff) | |
parent | e478bec0ba0a83a48a0f6982934b6de079e7e6b3 (diff) |
Merge branch 'master' into gfs2
Diffstat (limited to 'Documentation/i386/zero-page.txt')
-rw-r--r-- | Documentation/i386/zero-page.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/i386/zero-page.txt b/Documentation/i386/zero-page.txt index df28c7416781..c04a421f4a7c 100644 --- a/Documentation/i386/zero-page.txt +++ b/Documentation/i386/zero-page.txt | |||
@@ -63,6 +63,10 @@ Offset Type Description | |||
63 | 2 for bootsect-loader | 63 | 2 for bootsect-loader |
64 | 3 for SYSLINUX | 64 | 3 for SYSLINUX |
65 | 4 for ETHERBOOT | 65 | 4 for ETHERBOOT |
66 | 5 for ELILO | ||
67 | 7 for GRuB | ||
68 | 8 for U-BOOT | ||
69 | 9 for Xen | ||
66 | V = version | 70 | V = version |
67 | 0x211 char loadflags: | 71 | 0x211 char loadflags: |
68 | bit0 = 1: kernel is loaded high (bzImage) | 72 | bit0 = 1: kernel is loaded high (bzImage) |