]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 19 Jan 2011 11:14:52 +0000 (12:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 19 Jan 2011 11:14:52 +0000 (12:14 +0100)

Trivial merge