]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 26 May 2011 15:59:00 +0000 (17:59 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 26 May 2011 15:59:00 +0000 (17:59 +0200)

Trivial merge