Merge branch 'for-2.6.38' into for-2.6.39

author Mark Brown <[email protected]>

Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)

committer Mark Brown <[email protected]>

Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
author Mark Brown <[email protected]>
Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
committer Mark Brown <[email protected]>
Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
diff --cc sound/soc/codecs/wm8903.h
Simple merge
diff --cc sound/soc/codecs/wm8994.c
Simple merge
author	Mark Brown <[email protected]>
	Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
committer	Mark Brown <[email protected]>
	Tue, 22 Feb 2011 18:38:13 +0000 (10:38 -0800)
		1	2
sound/soc/codecs/wm8903.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8994.c	patch \|	diff1 \|	diff2 \|	blob \| history