]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sound-asoc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:40:15 +0000 (11:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 2 Nov 2015 00:40:15 +0000 (11:40 +1100)
1  2 
sound/soc/soc-pcm.c

Simple merge