Merge commit 's3c-iis-header' into HEAD

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Fri, 6 Mar 2009 13:36:37 +0000 (13:36 +0000)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Fri, 6 Mar 2009 13:36:44 +0000 (13:36 +0000)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Mar 2009 13:36:37 +0000 (13:36 +0000)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 6 Mar 2009 13:36:44 +0000 (13:36 +0000)
diff --cc sound/soc/s3c24xx/neo1973_wm8753.c
Simple merge
diff --cc sound/soc/s3c24xx/s3c24xx-i2s.c
Simple merge
diff --cc sound/soc/s3c24xx/s3c24xx-pcm.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Fri, 6 Mar 2009 13:36:37 +0000 (13:36 +0000)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Fri, 6 Mar 2009 13:36:44 +0000 (13:36 +0000)
		1	2
sound/soc/s3c24xx/neo1973_wm8753.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/s3c24xx/s3c24xx-i2s.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/s3c24xx/s3c24xx-pcm.c	patch \|	diff1 \|	diff2 \|	blob \| history