]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.5' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Apr 2012 19:12:52 +0000 (20:12 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 23 Apr 2012 19:12:52 +0000 (20:12 +0100)
1  2 
sound/soc/codecs/wm8994.c
sound/soc/soc-core.c

Simple merge
Simple merge