]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Tue, 31 Jan 2012 14:13:14 +0000 (15:13 +0100)
committerTakashi Iwai <tiwai@suse.de>
Tue, 31 Jan 2012 14:13:14 +0000 (15:13 +0100)

Trivial merge