Merge branch 'fix/asoc' into for-linus
commite2cd52e60726c30fa558cead7bc7413fd946261c
authorTakashi Iwai <tiwai@suse.de>
Wed, 18 Nov 2009 15:38:58 +0000 (18 16:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Nov 2009 15:38:58 +0000 (18 16:38 +0100)
tree9816475da36eac9d0e7e9f129f0a659ab7286015
parentef4b18e2af09b69b5a183ad611f5965ef1766be4
parentbab0212467e58929470ae3ae32515f17e30c3926
Merge branch 'fix/asoc' into for-linus