Mark Brown c91cf25ebf ASoC: Fix merge with PXA tree ...

Fix a merge issue caused by context overlap.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2009-01-23 11:23:32 +00:00

..

atmel

ASoC: Staticise PCM operations tables

2009-01-19 16:23:27 +00:00

au1x

ASoC: Staticise PCM operations tables

2009-01-19 16:23:27 +00:00

blackfin

ASoC: Staticise PCM operations tables

2009-01-19 16:23:27 +00:00

codecs

ASoC: remove stand-alone mode support from CS4270 codec driver

2009-01-23 11:12:57 +00:00

davinci

ASoC: Staticise PCM operations tables

2009-01-19 16:23:27 +00:00

fsl

ASoC: remove stand-alone mode support from CS4270 codec driver

2009-01-23 11:12:57 +00:00

omap

ASoC: Complete Beagleboard support

2009-01-21 13:43:52 +00:00

pxa

ASoC: Fix merge with PXA tree

2009-01-23 11:23:32 +00:00

s3c24xx

Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

2008-12-30 17:36:49 -08:00

sh

ALSA: ASoC - Fix wrong section types

2008-12-10 07:47:22 +01: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

Merge branch 'for-2.6.29' into for-2.6.30

2009-01-09 11:03:55 +00:00

soc-dapm.c

Merge branch 'topic/asoc' into next/asoc

2009-01-15 18:27:20 +01:00

soc-jack.c

ASoC: Add jack reporting interface

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