git.baikalelectronics.ru Git - kernel.git/commit

author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 9 Mar 2011 12:37:42 +0000 (12:37 +0000)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Wed, 9 Mar 2011 12:37:42 +0000 (12:37 +0000)
commit	dcd7e8133a2ad6619002ddadb78efbb903073dc7
tree	97b509b33d08a83dcd93406acfeccde4f2843ba5	tree \| snapshot
parent	95715b00ea0745df6b06c66990a0a3f941cccf48	commit \| diff
parent	760464670ad6fe0dbf2bb2d03ba35fe17f5a1978	commit \| diff

Merge branch 'for-2.6.38' into for-2.6.39

Conflicts:
sound/soc/codecs/wm8978.c
sound/soc/soc-dapm.c