Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

author Jaroslav Kysela <perex@suse.cz>

Wed, 22 Mar 2006 10:02:08 +0000 (11:02 +0100)

committer Jaroslav Kysela <perex@suse.cz>

Wed, 22 Mar 2006 10:02:08 +0000 (11:02 +0100)
author Jaroslav Kysela <perex@suse.cz>
Wed, 22 Mar 2006 10:02:08 +0000 (11:02 +0100)
committer Jaroslav Kysela <perex@suse.cz>
Wed, 22 Mar 2006 10:02:08 +0000 (11:02 +0100)
diff --cc drivers/media/video/cx88/cx88-alsa.c
Simple merge
diff --cc drivers/media/video/saa7134/saa7134-alsa.c
Simple merge
diff --cc drivers/media/video/saa7134/saa7134.h
Simple merge
author	Jaroslav Kysela <perex@suse.cz>
	Wed, 22 Mar 2006 10:02:08 +0000 (11:02 +0100)
committer	Jaroslav Kysela <perex@suse.cz>
	Wed, 22 Mar 2006 10:02:08 +0000 (11:02 +0100)
		1	2
drivers/media/video/cx88/cx88-alsa.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/saa7134/saa7134-alsa.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/saa7134/saa7134.h	patch \|	diff1 \|	diff2 \|	blob \| history