Hi Dmitry,
Today's linux-next merge of the input tree got a conflict in
Documentation/kernel-parameters.txt between commit
6902aa84f565153ce05f3438ecb8e445d4f468d8 ("doc: Add remaining SH
parameters to kernel-parameters.txt") from the sh tree and commit
36d9573928f9ab126d0089ead7ea5d2ab18fbfa9 ("Input: document i8042.debug in
kernel-parameters.txt") from the input tree.
Just context. I fixed it up (see below) and can carry the fix.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc Documentation/kernel-parameters.txt
index d564046,88600fe..0000000
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -824,8 -794,7 +824,9 @@@ and is between 256 and 4096 characters
Defaults to the default architecture's huge page size
if not specified.
+ hlt [BUGS=ARM,SH]
+
+ i8042.debug [HW] Toggle i8042 debug mode
i8042.direct [HW] Put keyboard port into non-translated mode
i8042.dumbkbd [HW] Pretend that controller can only read data from
keyboard and cannot control its state
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
