Merge suse.cz:/data/bk/linus into suse.cz:/data/bk/input

author Vojtech Pavlik <vojtech@suse.cz>

Tue, 16 Mar 2004 12:10:38 +0000 (13:10 +0100)

committer Vojtech Pavlik <vojtech@suse.cz>

Tue, 16 Mar 2004 12:10:38 +0000 (13:10 +0100)
author Vojtech Pavlik <vojtech@suse.cz>
Tue, 16 Mar 2004 12:10:38 +0000 (13:10 +0100)
committer Vojtech Pavlik <vojtech@suse.cz>
Tue, 16 Mar 2004 12:10:38 +0000 (13:10 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc drivers/char/Kconfig
Simple merge
diff --cc init/main.c
Simple merge
author	Vojtech Pavlik <vojtech@suse.cz>
	Tue, 16 Mar 2004 12:10:38 +0000 (13:10 +0100)
committer	Vojtech Pavlik <vojtech@suse.cz>
	Tue, 16 Mar 2004 12:10:38 +0000 (13:10 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history