Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 16:09:02 +0000 (08:09 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 16:09:02 +0000 (08:09 -0800)

Trivial merge