Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Jaroslav Kysela [Wed, 22 Mar 2006 10:02:08 +0000 (11:02 +0100)]
1  2 
drivers/media/video/cx88/cx88-alsa.c
drivers/media/video/saa7134/saa7134-alsa.c
drivers/media/video/saa7134/saa7134.h

Simple merge
Simple merge