]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:06 +0000 (20:57 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:06 +0000 (20:57 +0000)
1  2 
include/sound/pcm.h
sound/soc/codecs/pcm512x.c

Simple merge
Simple merge