Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 8 Oct 2005 21:59:13 +0000 (14:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 8 Oct 2005 21:59:13 +0000 (14:59 -0700)
commit8aa19ad84c38cd50bfc0560646efe1c9ca83d925
tree46eb8d8ea64620d989cabfe89c4f1d2dbba45b63
parent58a2c3221e3c78ea6c71148eb84d4170358981fb
parenta25f175c2f6962c38cdbacfc4b66b297f4fb54b2
Merge /pub/scm/linux/kernel/git/perex/alsa