]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 26 Aug 2011 07:29:43 +0000 (09:29 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 26 Aug 2011 07:29:43 +0000 (09:29 +0200)

Trivial merge