diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:44:33 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:44:33 -0400 |
| commit | db9431f0e697b132a7b6aca9c946f85851af5a39 (patch) | |
| tree | 0aae6e53244c57c2c2a649c7dfa22f5f8c378739 /Documentation | |
| parent | f25718e8cff17b5c64ad11c2a6e9d2ee1b676eef (diff) | |
| parent | 57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f (diff) | |
Merge remote-tracking branch 'linus' into linaro-3.0
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/boot.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt index 9b7221a86df..7c3a8801b7c 100644 --- a/Documentation/x86/boot.txt +++ b/Documentation/x86/boot.txt @@ -674,7 +674,7 @@ Protocol: 2.10+ Field name: init_size Type: read -Offset/size: 0x25c/4 +Offset/size: 0x260/4 This field indicates the amount of linear contiguous memory starting at the kernel runtime start address that the kernel needs before it |