]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 07:44:22 +0000 (09:44 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sat, 9 Jul 2011 07:44:22 +0000 (09:44 +0200)

Trivial merge