Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic...
authorMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:57 +0000 (00:23 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 21 May 2014 23:23:57 +0000 (00:23 +0100)
commit6f821c644966e6ccbe9a98e081621b7e1a58dc64
treed690124f07b7159ad74e0601019573f8f3dc208d
parent6630f30ed5e4d7f9fae9c7d63364225790765aef
parent49e3c6418ba480d95a05814cceecc0eda8545179
parent0596f70069bb5ab34eea980c14fad1041f2abae5
parentb45281412a6334ab2be5d7e449c98f50fb424a78
parente6b0d896ab0597d37422cae3cef3e789431549eb
parent57f174f47e73b4e6f325c9374c17f5fe1602e496
parent8c32570441f92244848c5e87f5d613465650aeee
Merge remote-tracking branches 'asoc/topic/nuc900', 'asoc/topic/omap', 'asoc/topic/pxa', 'asoc/topic/rcar', 'asoc/topic/rt5640' and 'asoc/topic/rt5645' into asoc-next
arch/arm/mach-shmobile/board-lager.c
arch/arm/mach-shmobile/clock-r8a7778.c
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/rt5640.c
sound/soc/omap/ams-delta.c
sound/soc/sh/rcar/core.c
sound/soc/sh/rcar/src.c
sound/soc/sh/rcar/ssi.c