diff options
| author | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-29 00:47:18 -0500 |
| commit | 0a8c5395f90f06d128247844b2515c8bf3f2826b (patch) | |
| tree | d95382dcdfa303b99d480c01763d6cb6767fdaca /Documentation/x86/boot.txt | |
| parent | 25051158bbed127e8672b43396c71c5eb610e5f1 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
[XFS] Fix merge failures
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/xfs/linux-2.6/xfs_cred.h
fs/xfs/linux-2.6/xfs_globals.h
fs/xfs/linux-2.6/xfs_ioctl.c
fs/xfs/xfs_vnodeops.h
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'Documentation/x86/boot.txt')
| -rw-r--r-- | Documentation/x86/boot.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 83c0033ee9e0..fcdc62b3c3d8 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt | |||
| @@ -349,7 +349,7 @@ Protocol: 2.00+ | |||
| 349 | 3 SYSLINUX | 349 | 3 SYSLINUX |
| 350 | 4 EtherBoot | 350 | 4 EtherBoot |
| 351 | 5 ELILO | 351 | 5 ELILO |
| 352 | 7 GRuB | 352 | 7 GRUB |
| 353 | 8 U-BOOT | 353 | 8 U-BOOT |
| 354 | 9 Xen | 354 | 9 Xen |
| 355 | A Gujin | 355 | A Gujin |
| @@ -537,8 +537,8 @@ Type: read | |||
| 537 | Offset/size: 0x248/4 | 537 | Offset/size: 0x248/4 |
| 538 | Protocol: 2.08+ | 538 | Protocol: 2.08+ |
| 539 | 539 | ||
| 540 | If non-zero then this field contains the offset from the end of the | 540 | If non-zero then this field contains the offset from the beginning |
| 541 | real-mode code to the payload. | 541 | of the protected-mode code to the payload. |
| 542 | 542 | ||
| 543 | The payload may be compressed. The format of both the compressed and | 543 | The payload may be compressed. The format of both the compressed and |
| 544 | uncompressed data should be determined using the standard magic | 544 | uncompressed data should be determined using the standard magic |