Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc...
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:49 +0000 (00:23 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:49 +0000 (00:23 +0100)
commit0c5dacf2ca07a1b9a5970cd06cc5eab496860382
tree7fcb6df82eab0738e8d0047ad6e234a2b8660801
parentb03a1c7029079d7e58306ae4daab85db62955984
parent3bb40619aca84905f87dd6bc7f6dce9efb525f28
parent5958de23edc4148a07a75abf7216a8426b8e199b
parent24fc81d5fe92e335cd93902a66fb3c4420d99375
Merge remote-tracking branches 'asoc/topic/cs42l56', 'asoc/topic/cs42xx8' and 'asoc/topic/davinci' into asoc-next
include/sound/soc.h
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/cs42l51.c
sound/soc/codecs/cs42l52.c
sound/soc/codecs/wm8962.c
sound/soc/omap/ams-delta.c