summaryrefslogtreecommitdiff
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-22 00:23:57 +0100
committerMark Brown <broonie@linaro.org>2014-05-22 00:23:57 +0100
commit6f821c644966e6ccbe9a98e081621b7e1a58dc64 (patch)
treed690124f07b7159ad74e0601019573f8f3dc208d /sound/soc/pxa
parent6630f30ed5e4d7f9fae9c7d63364225790765aef (diff)
parent49e3c6418ba480d95a05814cceecc0eda8545179 (diff)
parent0596f70069bb5ab34eea980c14fad1041f2abae5 (diff)
parentb45281412a6334ab2be5d7e449c98f50fb424a78 (diff)
parente6b0d896ab0597d37422cae3cef3e789431549eb (diff)
parent57f174f47e73b4e6f325c9374c17f5fe1602e496 (diff)
parent8c32570441f92244848c5e87f5d613465650aeee (diff)
downloadlinux-next-6f821c644966e6ccbe9a98e081621b7e1a58dc64.tar.gz
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