Merge branch 'for-2.6.38' into for-2.6.39

author Mark Brown <[email protected]>

Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)

committer Mark Brown <[email protected]>

Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
author Mark Brown <[email protected]>
Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
committer Mark Brown <[email protected]>
Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
diff --cc sound/soc/codecs/max98088.c
Simple merge
diff --cc sound/soc/samsung/smdk_spdif.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
committer	Mark Brown <[email protected]>
	Wed, 19 Jan 2011 11:22:54 +0000 (11:22 +0000)
		1	2
sound/soc/codecs/max98088.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/samsung/smdk_spdif.c	patch \|	diff1 \|	diff2 \|	blob \| history