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)
commitfae6ec69c84d71b1d5bda9ede1a262c1681684aa
treeeb4aff9a5c2b7d04ce09a3717bb1dd4a79fe7595
parentbbc0274e9bb2e3f1d724d445a2bd32566b9b66f7
parent1d345dac1f30af1cd9f3a1faa12f9f18f17f236e
Merge ... /linux/kernel/git/torvalds/linux-2.6.git
sound/core/sound.c