git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 18 Apr 2011 17:07:43 +0000 (18:07 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 18 Apr 2011 17:07:43 +0000 (18:07 +0100)
commit	d5381e42f64ca19f05c5799ffae5708acb6ed411
tree	8b5e757a9847047102c475c6c583afc191d02e5b	tree \| snapshot (tar.gz zip)
parent	f030d60b30855e18ac5bf080fa9e576147623d18	commit \| diff
parent	b3c27b51db9112d03864fdef44fa611dd69c1425	commit \| diff

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

Fix trivial conflict caused by silly spelling fix patch.

Conflicts:
sound/soc/codecs/wm8994.c

drivers/staging/intel_sst/intel_sst_drv_interface.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/intel_sst/intelmid.c	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/sn95031.c	diff1 \|	diff2 \|	blob \| history
sound/soc/imx/imx-ssi.c	diff1 \|	diff2 \|	blob \| history
sound/soc/mid-x86/sst_platform.c	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-jack.c	diff1 \|	diff2 \|	blob \| history