Russell King ed40d0c472 Merge branch 'origin' into devel ...

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

2009-03-28 20:29:51 +00:00

..

atmel

ASoC: Merge dai_ops factor out

2009-03-11 16:51:31 +00:00

au1x

ASoC: make ops a pointer in 'struct snd_soc_dai'

2009-03-04 22:29:47 +00:00

blackfin

ASoC: Merge dai_ops factor out

2009-03-11 16:51:31 +00:00

codecs

ASoC: Add FLL support for WM8400

2009-03-19 11:56:11 +00:00

davinci

ASoC: Merge dai_ops factor out

2009-03-11 16:51:31 +00:00

fsl

ASoC: Merge dai_ops factor out

2009-03-11 16:51:31 +00:00

omap

ASoC: Declare Headset as Mic and Headphone widgets for SDP3430

2009-03-19 11:56:16 +00:00

pxa

Merge branch 'origin' into devel

2009-03-28 20:29:51 +00:00

s3c24xx

ASoC: Fix some missing dai_ops conversions

2009-03-16 14:13:57 +00:00

sh

ASoC: Fix some missing dai_ops conversions

2009-03-16 14:13:57 +00:00

Kconfig

ASoC: Add jack reporting interface

2009-01-09 10:31:31 +00:00

Makefile

ASoC: Add jack reporting interface

2009-01-09 10:31:31 +00:00

soc-core.c

ASoC: Only deregister AC97 dev if it's name was not "AC97"

2009-03-17 13:59:47 +00:00

soc-dapm.c

ASoC: Fix memory allocation for snd_soc_dapm_switch names

2009-03-06 13:37:14 +00:00

soc-jack.c

ASoC: Staticise workqueue function for GPIO jack detection

2009-03-06 13:37:19 +00:00