]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 5 Oct 2009 12:58:01 +0000 (14:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 5 Oct 2009 12:58:01 +0000 (14:58 +0200)
1  2 
sound/soc/codecs/wm8940.c
sound/soc/soc-dapm.c

Simple merge
Simple merge