Merge branch 'for-2.6.37' into for-2.6.38

author Mark Brown <[email protected]>

Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)

committer Mark Brown <[email protected]>

Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)
author Mark Brown <[email protected]>
Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)
committer Mark Brown <[email protected]>
Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)
diff --cc sound/soc/codecs/wm8994.c
Simple merge
diff --cc sound/soc/davinci/davinci-evm.c
Simple merge
author	Mark Brown <[email protected]>
	Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)
committer	Mark Brown <[email protected]>
	Wed, 17 Nov 2010 18:59:19 +0000 (18:59 +0000)
		1	2
sound/soc/codecs/wm8994.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/davinci/davinci-evm.c	patch \|	diff1 \|	diff2 \|	blob \| history