]> git.baikalelectronics.ru Git - kernel.git/commit
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:07:43 +0000 (18:07 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 17:07:43 +0000 (18:07 +0100)
commit2f8ea6b395f2f2db74ee5f891ac771476fea3a82
tree8b5e757a9847047102c475c6c583afc191d02e5b
parent6e764bf44259468860c70ea0908ac402252ca872
parentcaf3824fb6aaea7094b02072e78fc66905427ffb
ASoC: Merge branch 'for-2.6.39' into for-2.6.40

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
sound/soc/codecs/wm8994.c
drivers/staging/intel_sst/intel_sst_drv_interface.c
drivers/staging/intel_sst/intelmid.c
sound/soc/codecs/sn95031.c
sound/soc/imx/imx-ssi.c
sound/soc/mid-x86/sst_platform.c
sound/soc/soc-jack.c