projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
[deliverable/linux.git]
/
Documentation
/
kernel-parameters.txt
diff --git
a/Documentation/kernel-parameters.txt
b/Documentation/kernel-parameters.txt
index 54ebf100e4e02301e8f2f88a0b98ddc85d653a85..92e1ab8178a8693856c599dcc80c0e4f77a78390 100644
(file)
--- a/
Documentation/kernel-parameters.txt
+++ b/
Documentation/kernel-parameters.txt
@@
-1006,6
+1006,7
@@
and is between 256 and 4096 characters. It is defined in the file
nomerge
forcesac
soft
+ pt [x86, IA64]
io7= [HW] IO7 for Marvel based alpha systems
See comment before marvel_specify_io7 in
This page took
0.025189 seconds
and
5
git commands to generate.