Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
commit5501972e0b5857bc8354770d900ceb9b40c7f6b7
authorJaroslav Kysela <perex@suse.cz>
Wed, 22 Mar 2006 10:02:08 +0000 (22 11:02 +0100)
committerJaroslav Kysela <perex@suse.cz>
Wed, 22 Mar 2006 10:02:08 +0000 (22 11:02 +0100)
treeff239422827c4cd54d2998f8851304255de31b38
parent9d2f928ddf64ca0361562e30faf584cd33055c60
parente952f31bce6e9f64db01f607abc46529ba57ac9e
Merge ... /linux/kernel/git/torvalds/linux-2.6.git
drivers/media/video/cx88/cx88-alsa.c
drivers/media/video/saa7134/saa7134-alsa.c
drivers/media/video/saa7134/saa7134.h