Merge commit 'takashi/topic/asoc' into for-2.6.30

	tristate "SoC I2S Audio support for Jive"

	depends on SND_S3C24XX_SOC && MACH_JIVE

	select SND_SOC_WM8750

	select SND_SOC_WM8750_SPI

	select SND_S3C2412_SOC_I2S

	help

	  Sat Y if you want to add support for SoC audio on the Jive.