Mark Brown a9e3de6f9f Merge branch 'tegra' into for-2.6.40 ...

Fix up merge with Harmony driver rename.

Conflicts:
	sound/soc/tegra/Kconfig

2011-04-21 12:00:27 +01:00

..

atmel

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

2011-04-18 18:07:43 +01:00

au1x

ASoC: Remove -codec from WM8731 driver name

2011-03-30 07:15:33 +09:00

blackfin

ASoC: Blackfin: push down SPORT settings from global variables

2011-03-30 07:20:05 +09:00

codecs

ASoC: WM8903: Implement DMIC support

2011-04-20 14:00:35 +01:00

davinci

asoc: davinci_voicecodec: use mfd_data instead of driver_data

2011-03-23 10:41:56 +01:00

ep93xx

ASoC: Enable 192kHz sample rate for EP93xx.

2011-03-09 13:08:42 +00:00

fsl

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2011-03-18 10:46:37 -07:00

imx

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

2011-04-18 18:07:43 +01:00

jz4740

ASoC: JZ4740: qi_lb60: Use the SND_SOC_DAPM_EVENT_OFF for the speakers status

2011-04-13 10:34:54 -07:00

kirkwood

Fix common misspellings

2011-03-31 11:26:23 -03:00

mid-x86

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

2011-04-18 18:07:43 +01:00

nuc900

Merge branch 'for-2.6.37' into for-2.6.38

2010-11-30 11:35:43 +00:00

omap

Fix common misspellings

2011-03-31 11:26:23 -03:00

pxa

ASoC: Properly handle spitz MIC GPIO

2011-04-03 22:11:09 +09:00

s6000

ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers

2011-01-05 11:28:50 +00:00

samsung

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

2011-04-18 18:07:43 +01:00

sh

ASoC: add a module alias to the FSI driver

2011-04-18 17:14:28 +01:00

tegra

Merge branch 'tegra' into for-2.6.40

2011-04-21 12:00:27 +01:00

txx9

ASoC: multi-component - ASoC Multi-Component Support

2010-08-12 14:00:00 +01:00

Kconfig

ASoC: tegra: Kconfig and Makefile

2011-01-10 22:21:09 +00:00

Makefile

ASoC: tegra: Kconfig and Makefile

2011-01-10 22:21:09 +00:00

soc-cache.c

ASoC: remove unused comment

2011-04-20 13:50:16 +01:00

soc-core.c

ASoC: fix two ident style problems

2011-04-20 13:50:29 +01:00

soc-dapm.c

ASoC: fix a simple coding style issue

2011-04-20 13:50:11 +01:00

soc-jack.c

ASoC: Merge branch 'for-2.6.39' into for-2.6.40

2011-04-18 18:07:43 +01:00

soc-utils.c

ASoC: Use snd_pcm_format_width() in snd_soc_params_to_frame_size()

2011-02-01 14:31:40 +00:00