Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:01 +0000 (16:32 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 4 Aug 2014 15:32:01 +0000 (16:32 +0100)
commitc1bd940afdba6d8d6a0a2219cf6ae9dafc7ef0a9
treed76f4a4b76d38fc2ea05fd4497225c1e1d29a0fb
parentb0ae27c477b19d1da015e6ace0a5707d4173ff8b
parent019575726e6d93933ed6823475d09b932be2a5fc
parentf18803a3758a55feb376490a76c351ab40c3cf03
parent1bb60b3a5ae526287fc6d0c55391f5664cc1e672
parent71864b22f50ceab0025ae2a1cd81b956878ded2b
parent9f98cd69c1517e05aa00ab843f054457cc3488c1
Merge remote-tracking branches 'asoc/topic/rt5670', 'asoc/topic/rt5677', 'asoc/topic/s6000', 'asoc/topic/samsung' and 'asoc/topic/sh-fsi' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/samsung/i2s.c
sound/soc/sh/fsi.c