]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 18 Aug 2010 13:22:18 +0000 (15:22 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Aug 2010 13:22:18 +0000 (15:22 +0200)

Trivial merge