]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 9 Dec 2010 07:24:32 +0000 (08:24 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 9 Dec 2010 07:24:32 +0000 (08:24 +0100)

Trivial merge