]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 11:28:50 +0000 (13:28 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 11:28:50 +0000 (13:28 +0200)
1  2 
sound/soc/atmel/atmel_ssc_dai.c
sound/soc/soc-cache.c

Simple merge
Simple merge