summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-03 11:39:50 +0200
committerMark Brown <broonie@linaro.org>2014-06-03 11:39:50 +0200
commit9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231 (patch)
tree7ed4bbd01d1ba11f41aedaf48e81a37bdce94f8b /sound/soc
parentMerge remote-tracking branch 'asoc/topic/fsl-ssi' into asoc-next (diff)
parentASoC: jack: Fix multiple definition of `snd_soc_jack_add_gpiods' (diff)
parentASoC: intel: The Baytrail/MAX98090 driver depends on I2C (diff)
downloadlinux-9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231.tar.xz
linux-9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231.zip
Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc-next