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 'devel'
[sfrench/cifs-2.6.git]
/
Documentation
/
x86
/
zero-page.txt
diff --git
a/Documentation/x86/zero-page.txt
b/Documentation/x86/zero-page.txt
index 169ad423a3d12243023d5807d1d7a4025d1a3978..4f913857b8a26bae558c5b0f30a6bba0799fcbf9 100644
(file)
--- a/
Documentation/x86/zero-page.txt
+++ b/
Documentation/x86/zero-page.txt
@@
-3,7
+3,7
@@
protocol of kernel. These should be filled by bootloader or 16-bit
real-mode setup code of the kernel. References/settings to it mainly
are in:
-
include/asm-x86
/bootparam.h
+
arch/x86/include/asm
/bootparam.h
Offset Proto Name Meaning