summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/ams-delta.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-22 01:23:57 +0200
committerMark Brown <broonie@linaro.org>2014-05-22 01:23:57 +0200
commit6f821c644966e6ccbe9a98e081621b7e1a58dc64 (patch)
treed690124f07b7159ad74e0601019573f8f3dc208d /sound/soc/omap/ams-delta.c
parentMerge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', 'aso... (diff)
parentASoC: nuc900: export nuc900_ac97_data (diff)
parentASoC: omap: Replace instances of rtd->codec->card with rtd->card (diff)
parentASoC: pxa: remove mach header dependency (diff)
parentASoC: rsnd: Fix warnings due to improper printk formats (diff)
parentASoC: rt5640: add default case for unexpected ID (diff)
parentASoC: rt5645: Fix updating wrong register for T5645_AIF2 case (diff)
downloadlinux-6f821c644966e6ccbe9a98e081621b7e1a58dc64.tar.xz
linux-6f821c644966e6ccbe9a98e081621b7e1a58dc64.zip
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