Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorJaroslav Kysela <perex@hera.kernel.org>
Tue, 21 Jun 2005 14:39:41 +0000 (07:39 -0700)
committerJaroslav Kysela <perex@hera.kernel.org>
Tue, 21 Jun 2005 14:39:41 +0000 (07:39 -0700)
1  2 
sound/core/sound.c

Simple merge