Merge branch 'for-2.6.38' into for-2.6.39

author Mark Brown <[email protected]>

Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)

committer Mark Brown <[email protected]>

Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
author Mark Brown <[email protected]>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
committer Mark Brown <[email protected]>
Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
diff --cc sound/soc/pxa/tosa.c
Simple merge
diff --cc sound/soc/pxa/zylonite.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
committer	Mark Brown <[email protected]>
	Fri, 25 Feb 2011 11:45:09 +0000 (11:45 +0000)
		1	2
sound/soc/pxa/tosa.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/pxa/zylonite.c	patch \|	diff1 \|	diff2 \|	blob \| history