git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.iov_iter' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
Documentation
/
x86
/
boot.txt
diff --git
a/Documentation/x86/boot.txt
b/Documentation/x86/boot.txt
index 5e9b826b5f62fd1cf8dfcae07fc5bde66594428b..f4c2a97bfdbd0d1ed058013b7dbce161d5fb6d9a 100644
(file)
--- a/
Documentation/x86/boot.txt
+++ b/
Documentation/x86/boot.txt
@@
-58,7
+58,7
@@
Protocol 2.11: (Kernel 3.6) Added a field for offset of EFI handover
protocol entry point.
Protocol 2.12: (Kernel 3.8) Added the xloadflags field and extension fields
- to struct boot_params for loading bzImage and ramdisk
+ to struct boot_params for loading bzImage and ramdisk
above 4G in 64bit.
**** MEMORY LAYOUT