Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dpcm' into asoc...
authorMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:52 +0000 (18:54 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:52 +0000 (18:54 +0100)
commit698803f8b9cec4e224bc344f7120f70246457ae0
tree5c6a7df6f9fc468711edfafc8db5d9563a786371
parent6ba82f91df1f3b57a2339581f5065d178be7e413
parent518f6bab13842a5f25bd8f89b1cae32aa8adf91f
parentb073ed4e21268da59c40a4fc5d56e3af808ecc4d
Merge remote-tracking branches 'asoc/topic/davinci' and 'asoc/topic/dpcm' into asoc-next
include/sound/soc.h
sound/soc/davinci/davinci-mcasp.c