]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mfd/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:21:03 +0000 (12:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Apr 2012 02:21:03 +0000 (12:21 +1000)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/twl6040.c

Simple merge
Simple merge